extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 23:00:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix Argument #2 ($old) must be of type ?array, bool given

Browse Source
This commit is contained in:
ralf 2024-04-03 10:37:16 +02:00
parent c672451324
commit 30604b9d67
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/src/Contacts.php
View File

@ -913,7 +913,7 @@ class Contacts extends Contacts\Storage
{ {
if (!isset($contact['owner']) || !isset($contact['private'])) // owner/private not set on update, eg. SyncML if (!isset($contact['owner']) || !isset($contact['private'])) // owner/private not set on update, eg. SyncML
{ {
if (($old = $this->read($contact['id']))) // --> try reading the old entry and set it from there if (($old = $this->read($contact['id']) ?: null)) // --> try reading the old entry and set it from there
{ {
if(!isset($contact['owner'])) if(!isset($contact['owner']))
{ {
@ -1005,7 +1005,7 @@ class Contacts extends Contacts\Storage
// Get old record for tracking changes // Get old record for tracking changes
if (!isset($old) && $isUpdate) if (!isset($old) && $isUpdate)
{ {
$old = $this->read($contact['id']); $old = $this->read($contact['id']) ?: null;
} }
$to_write = $contact; $to_write = $contact;
// (non-admin) user editing his own account, make sure he does not change fields he is not allowed to (eg. via SyncML or xmlrpc) // (non-admin) user editing his own account, make sure he does not change fields he is not allowed to (eg. via SyncML or xmlrpc)
@ -1086,7 +1086,7 @@ class Contacts extends Contacts\Storage
if(empty($contact['account_id']) || $contact['account_id'] && $this->account_repository == 'sql') if(empty($contact['account_id']) || $contact['account_id'] && $this->account_repository == 'sql')
{ {
if (!isset($this->tracking)) $this->tracking = new Contacts\Tracking($this); if (!isset($this->tracking)) $this->tracking = new Contacts\Tracking($this);
$this->tracking->track($to_write, $old ?? null, null, $deleted); $this->tracking->track($to_write, $old, null, $deleted);
} }
// Notify linked apps about changes in the contact data // Notify linked apps about changes in the contact data