php8 fixes
This commit is contained in:
parent
f3592eaf3b
commit
d711a32fab
3 changed files with 3 additions and 1 deletions
|
@ -476,6 +476,7 @@ class kolab_contacts extends rcube_addressbook
|
||||||
}
|
}
|
||||||
|
|
||||||
// advanced search
|
// advanced search
|
||||||
|
$advanced = false;
|
||||||
if (is_array($value)) {
|
if (is_array($value)) {
|
||||||
$advanced = true;
|
$advanced = true;
|
||||||
$value = array_map('mb_strtolower', $value);
|
$value = array_map('mb_strtolower', $value);
|
||||||
|
|
|
@ -310,6 +310,7 @@ class kolab_format_contact extends kolab_format
|
||||||
|
|
||||||
// organisation related properties (affiliation)
|
// organisation related properties (affiliation)
|
||||||
$orgs = $this->obj->affiliations();
|
$orgs = $this->obj->affiliations();
|
||||||
|
$org = null;
|
||||||
if ($orgs->size()) {
|
if ($orgs->size()) {
|
||||||
$org = $orgs->get(0);
|
$org = $orgs->get(0);
|
||||||
$object['organization'] = $org->organisation();
|
$object['organization'] = $org->organisation();
|
||||||
|
|
|
@ -69,7 +69,7 @@ class kolab_storage_folder extends kolab_storage_folder_api
|
||||||
}
|
}
|
||||||
|
|
||||||
$oldtype = $this->type;
|
$oldtype = $this->type;
|
||||||
list($this->type, $suffix) = explode('.', $type_annotation);
|
list($this->type, $suffix) = array_pad(explode('.', $type_annotation), 2, null);
|
||||||
$this->default = $suffix == 'default';
|
$this->default = $suffix == 'default';
|
||||||
$this->subtype = $this->default ? '' : $suffix;
|
$this->subtype = $this->default ? '' : $suffix;
|
||||||
$this->id = kolab_storage::folder_id($name);
|
$this->id = kolab_storage::folder_id($name);
|
||||||
|
|
Loading…
Add table
Reference in a new issue