mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-28 01:29:05 +01:00
if modified timestamp get set, reset evtl. existing deleted timestamp, as recovering of deleted entries does NOT work otherwise
This commit is contained in:
parent
83dae424e0
commit
8160ff2472
@ -165,6 +165,9 @@ class contenthistory
|
|||||||
'sync_changedby' => $GLOBALS['egw_info']['user']['account_id'],
|
'sync_changedby' => $GLOBALS['egw_info']['user']['account_id'],
|
||||||
$_action == 'delete' ? 'sync_deleted' : 'sync_modified' => $this->db->to_timestamp($_ts),
|
$_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__);
|
$this->db->update(self::TABLE, $newData, $where,__LINE__,__FILE__);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user