Fix PHP 7.4 deprecation warning on implode()
This commit is contained in:
parent
a99d2b6187
commit
112516794f
5 changed files with 9 additions and 9 deletions
|
@ -2375,7 +2375,7 @@ class kolab_driver extends calendar_driver
|
|||
if (strlen($folder)) {
|
||||
$path_imap = explode($delim, $folder);
|
||||
array_pop($path_imap); // pop off name part
|
||||
$path_imap = implode($path_imap, $delim);
|
||||
$path_imap = implode($delim, $path_imap);
|
||||
|
||||
$options = $storage->folder_info($folder);
|
||||
}
|
||||
|
|
|
@ -183,7 +183,7 @@ class kolab_addressbook_ui
|
|||
if ($action == 'edit') {
|
||||
$path_imap = explode($delim, $folder);
|
||||
$name = rcube_charset::convert(array_pop($path_imap), 'UTF7-IMAP');
|
||||
$path_imap = implode($path_imap, $delim);
|
||||
$path_imap = implode($delim, $path_imap);
|
||||
}
|
||||
else { // create
|
||||
$path_imap = $folder;
|
||||
|
|
|
@ -460,7 +460,7 @@ class rcube_kolab_contacts extends rcube_addressbook
|
|||
|
||||
$scount = count($fields);
|
||||
// build key name regexp
|
||||
$regexp = '/^(' . implode($fields, '|') . ')(?:.*)$/';
|
||||
$regexp = '/^(' . implode('|', $fields) . ')(?:.*)$/';
|
||||
|
||||
// pass query to storage if only indexed cols are involved
|
||||
// NOTE: this is only some rough pre-filtering but probably includes false positives
|
||||
|
|
|
@ -306,7 +306,7 @@ class kolab_notes_ui
|
|||
|
||||
$path_imap = explode($delim, $folder_name);
|
||||
array_pop($path_imap); // pop off name part
|
||||
$path_imap = implode($path_imap, $delim);
|
||||
$path_imap = implode($delim, $path_imap);
|
||||
}
|
||||
else {
|
||||
$path_imap = '';
|
||||
|
|
|
@ -1371,8 +1371,8 @@ class kolab_storage
|
|||
self::$subscriptions = self::$imap->list_folders_subscribed();
|
||||
self::$with_tempsubs = true;
|
||||
}
|
||||
self::$states = self::$subscriptions;
|
||||
$folders = implode(self::$states, '**');
|
||||
self::$states = (array) self::$subscriptions;
|
||||
$folders = implode('**', self::$states);
|
||||
$rcube->user->save_prefs(array('kolab_active_folders' => $folders));
|
||||
}
|
||||
|
||||
|
@ -1396,9 +1396,9 @@ class kolab_storage
|
|||
}
|
||||
|
||||
// update user preferences
|
||||
$folders = implode(self::$states, '**');
|
||||
$rcube = rcube::get_instance();
|
||||
return $rcube->user->save_prefs(array('kolab_active_folders' => $folders));
|
||||
$folders = implode('**', self::$states);
|
||||
|
||||
return rcube::get_instance()->user->save_prefs(array('kolab_active_folders' => $folders));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
Loading…
Add table
Reference in a new issue