mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-01-03 04:29:28 +01:00
* InfoLog: fix saving an InfoLog twice gave error that entry was modified, if user timezone was different from server
This commit is contained in:
parent
7293b34493
commit
879f882ef1
@ -959,8 +959,7 @@ class infolog_bo
|
||||
// It's now disabled for xmlrpc, as otherwise the xmlrpc code need to be changed!
|
||||
$xmlrpc = is_object($GLOBALS['server']) && $GLOBALS['server']->last_method;
|
||||
$check_modified = $values['info_datemodified'] && !$xmlrpc ? $to_write['info_datemodified'] : false;
|
||||
$values['info_datemodified'] = $this->user_time_now;
|
||||
$to_write['info_datemodified'] = $this->now;
|
||||
$values['info_datemodified'] = $to_write['info_datemodified'] = $this->now;
|
||||
if ($check_modified && isset($values['info_etag']))
|
||||
{
|
||||
++$values['info_etag'];
|
||||
@ -2325,4 +2324,4 @@ class infolog_bo
|
||||
}
|
||||
return $foundInfoLogs;
|
||||
}
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue
Block a user