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

This commit is contained in:
Ralf Becker 2010-09-09 09:08:37 +00:00
parent 83dae424e0
commit 8160ff2472

View File

@ -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;
} }