mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-06-20 18:08:02 +02:00
Infolog: Fix incorrect modified date passed back to client after initial save
This commit is contained in:
parent
da2ab2004b
commit
44f88aba54
@ -959,7 +959,8 @@ class infolog_bo
|
|||||||
// It's now disabled for xmlrpc, as otherwise the xmlrpc code need to be changed!
|
// It's now disabled for xmlrpc, as otherwise the xmlrpc code need to be changed!
|
||||||
$xmlrpc = is_object($GLOBALS['server']) && $GLOBALS['server']->last_method;
|
$xmlrpc = is_object($GLOBALS['server']) && $GLOBALS['server']->last_method;
|
||||||
$check_modified = $values['info_datemodified'] && !$xmlrpc ? $to_write['info_datemodified'] : false;
|
$check_modified = $values['info_datemodified'] && !$xmlrpc ? $to_write['info_datemodified'] : false;
|
||||||
$values['info_datemodified'] = $to_write['info_datemodified'] = $this->now;
|
$values['info_datemodified'] = $this->user_time_now;
|
||||||
|
$to_write['info_datemodified'] = $this->now;
|
||||||
if($check_modified && isset($values['info_etag']))
|
if($check_modified && isset($values['info_etag']))
|
||||||
{
|
{
|
||||||
++$values['info_etag'];
|
++$values['info_etag'];
|
||||||
@ -985,6 +986,7 @@ class infolog_bo
|
|||||||
if(!isset($values['info_type']) || $status_only || empty($values['caldav_name']))
|
if(!isset($values['info_type']) || $status_only || empty($values['caldav_name']))
|
||||||
{
|
{
|
||||||
$values = $this->read($info_id, true, 'server', $ignore_acl);
|
$values = $this->read($info_id, true, 'server', $ignore_acl);
|
||||||
|
$this->time2time($values);
|
||||||
}
|
}
|
||||||
|
|
||||||
$values['info_id'] = $info_id;
|
$values['info_id'] = $info_id;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user