Micke/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

kolab_config: Fix PHP8 warnings

Browse source
This commit is contained in:
Aleksander Machniak 2023-11-21 10:36:15 +01:00
parent 62be45e882
commit a57b7a3699
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
plugins/kolab_config/kolab_config.php
View file

@ -31,6 +31,7 @@ class kolab_config extends rcube_plugin
public $task = 'utils|mail'; public $task = 'utils|mail';
private $config; private $config;
private $loaded = false;
private $dicts = array(); private $dicts = array();
const O_TYPE = 'dictionary'; const O_TYPE = 'dictionary';
@ -139,9 +140,9 @@ class kolab_config extends rcube_plugin
* Load dictionary config objects from Kolab storage * Load dictionary config objects from Kolab storage
* *
* @param string The language (2 chars) to load * @param string The language (2 chars) to load
* @param boolean Only load objects from default folder * @param bool Only load objects from default folder
* *
* @return array Dictionary object as hash array * @return array|null Dictionary object as hash array
*/ */
private function read_dictionary($lang, $default = false) private function read_dictionary($lang, $default = false)
{ {
@ -153,7 +154,7 @@ class kolab_config extends rcube_plugin
foreach ($this->config->get_objects($query, $default, null, 100) as $object) { foreach ($this->config->get_objects($query, $default, null, 100) as $object) {
if ($object['language'] == $lang || $object['language'] == 'XX') { if ($object['language'] == $lang || $object['language'] == 'XX') {
if (is_array($this->dicts[$lang])) if (isset($this->dicts[$lang]) && is_array($this->dicts[$lang]))
$this->dicts[$lang]['e'] = array_merge((array)$this->dicts[$lang]['e'], $object['e']); $this->dicts[$lang]['e'] = array_merge((array)$this->dicts[$lang]['e'], $object['e']);
else else
$this->dicts[$lang] = $object; $this->dicts[$lang] = $object;
@ -167,6 +168,6 @@ class kolab_config extends rcube_plugin
} }
} }
return $this->dicts[$lang]; return $this->dicts[$lang] ?? null;
} }
} }