extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-24 00:43:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

do NOT instanciate tracking class by default: it is only used for (seldome) updates and stalls updates in setup sometimes (1.6 update)

Browse Source
This commit is contained in:
Ralf Becker 2012-06-17 10:03:50 +00:00
parent fab868ac5c
commit 478c4ed712
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
addressbook/inc/class.addressbook_bo.inc.php
View File

@ -306,8 +306,6 @@ class addressbook_bo extends addressbook_so
} }
$this->categories = new categories($this->user,'addressbook'); $this->categories = new categories($this->user,'addressbook');
$this->tracking = new addressbook_tracking($this);
$config = config::read('phpgwapi'); $config = config::read('phpgwapi');
$this->delete_history = $config['history']; $this->delete_history = $config['history'];
} }
@ -765,6 +763,7 @@ class addressbook_bo extends addressbook_so
if ($ok && $old['tid'] != addressbook_so::DELETED_TYPE) if ($ok && $old['tid'] != addressbook_so::DELETED_TYPE)
{ {
$GLOBALS['egw']->contenthistory->updateTimeStamp('contacts', $id, 'delete', time()); $GLOBALS['egw']->contenthistory->updateTimeStamp('contacts', $id, 'delete', time());
if (!isset($this->tracking)) $this->tracking = new addressbook_tracking($this);
$this->tracking->track(array('id' => $id), array('id' => $id), null, true); $this->tracking->track(array('id' => $id), array('id' => $id), null, true);
} }
} }
@ -926,8 +925,10 @@ class addressbook_bo extends addressbook_so
} }
// Record change history for sql - doesn't work for LDAP accounts // Record change history for sql - doesn't work for LDAP accounts
if(!$contact['account_id'] || $contact['account_id'] && $this->account_repository == 'sql') { if(!$contact['account_id'] || $contact['account_id'] && $this->account_repository == 'sql')
{
$deleted = ($old['tid'] == addressbook_so::DELETED_TYPE || $contact['tid'] == addressbook_so::DELETED_TYPE); $deleted = ($old['tid'] == addressbook_so::DELETED_TYPE || $contact['tid'] == addressbook_so::DELETED_TYPE);
if (!isset($this->tracking)) $this->tracking = new addressbook_tracking($this);
$this->tracking->track($to_write, $old ? $old : null, null, $deleted); $this->tracking->track($to_write, $old ? $old : null, null, $deleted);
} }
} }