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

savegard the account_id against changes not triggered by the accounts-class, eg. via SyncML/xmlrpc

Browse Source
This commit is contained in:
Ralf Becker 2006-07-09 22:46:58 +00:00
parent ecc09fc1a2
commit 7ae03372ab
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
addressbook/inc/class.bocontacts.inc.php
View File

@ -425,6 +425,12 @@ class bocontacts extends socontacts
$contact['n_fn'] = $this->fullname($contact); $contact['n_fn'] = $this->fullname($contact);
if (isset($contact['org_name'])) $contact['n_fileas'] = $this->fileas($contact); if (isset($contact['org_name'])) $contact['n_fileas'] = $this->fileas($contact);
} }
// savegard the account_id against changes not triggered by the accounts-class
if (isset($contact['account_id']) && !$ignore_acl)
{
$account_id = $contact['account_id'];
unset($contact['account_id']);
}
// we dont update the content-history, if we run inside setup (admin-account-creation) // we dont update the content-history, if we run inside setup (admin-account-creation)
if(!($this->error = parent::save($contact)) && is_object($GLOBALS['egw']->contenthistory)) if(!($this->error = parent::save($contact)) && is_object($GLOBALS['egw']->contenthistory))
{ {
@ -435,6 +441,9 @@ class bocontacts extends socontacts
$GLOBALS['egw']->accounts->cache_invalidate($contact['account_id']); $GLOBALS['egw']->accounts->cache_invalidate($contact['account_id']);
} }
} }
// restoring the unset account_id
if ($account_id) $contact['account_id'] = $acount_id;
return !$this->error; return !$this->error;
} }