holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

if modified timestamp get set, reset evtl. existing deleted timestamp, as recovering of deleted entries does NOT work otherwise

Browse Source
This commit is contained in:
Ralf Becker 2010-09-09 09:08:37 +00:00
parent 83dae424e0
commit 8160ff2472
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
phpgwapi/inc/class.contenthistory.inc.php
View File

@ -165,6 +165,9 @@ class contenthistory
'sync_changedby' => $GLOBALS['egw_info']['user']['account_id'],
$_action == 'delete' ? 'sync_deleted' : 'sync_modified' => $this->db->to_timestamp($_ts),
);
// if deleted entry get's modified, removed deleted timestamp, as it got recovered
if ($_action == 'modify') $newData['sync_deleted'] = null;
$this->db->update(self::TABLE, $newData, $where,__LINE__,__FILE__);
break;
}