From 901f5873bc5377b0b31cd345aea69288f48094b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Lehrke?= Date: Sat, 18 Sep 2010 11:28:12 +0000 Subject: [PATCH] Fix GroupDAV ctag issues --- addressbook/inc/class.addressbook_groupdav.inc.php | 4 ++-- infolog/inc/class.infolog_groupdav.inc.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addressbook/inc/class.addressbook_groupdav.inc.php b/addressbook/inc/class.addressbook_groupdav.inc.php index 443cc2a203..d4b605d3cc 100644 --- a/addressbook/inc/class.addressbook_groupdav.inc.php +++ b/addressbook/inc/class.addressbook_groupdav.inc.php @@ -393,11 +393,11 @@ class addressbook_groupdav extends groupdav_handler if (empty($result)) { - $ctag = $result[0]['contact_modified']; + $ctag = 0; } else { - $ctag = time(); + $ctag = $result[0]['contact_modified']; } return 'EGw-'.$ctag.'-wGE'; diff --git a/infolog/inc/class.infolog_groupdav.inc.php b/infolog/inc/class.infolog_groupdav.inc.php index 6d61240b10..1b49ad1c64 100644 --- a/infolog/inc/class.infolog_groupdav.inc.php +++ b/infolog/inc/class.infolog_groupdav.inc.php @@ -513,7 +513,7 @@ class infolog_groupdav extends groupdav_handler $result =& $this->bo->search($query); - if (empty($result)) return 'EGw-'.time().'-wGE'; + if (empty($result)) return 'EGw-0-wGE'; $entry = array_shift($result);