From bd6889657e27a3914c816fe97b730e0dacdfdb85 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Thu, 24 Mar 2011 22:18:30 +0000 Subject: [PATCH] fixed etag for series not containing etag's of exceptions --- calendar/inc/class.calendar_bo.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/calendar/inc/class.calendar_bo.inc.php b/calendar/inc/class.calendar_bo.inc.php index b5ec49fa75..bdd0351097 100644 --- a/calendar/inc/class.calendar_bo.inc.php +++ b/calendar/inc/class.calendar_bo.inc.php @@ -1893,7 +1893,7 @@ class calendar_bo } $etag .= ':' . $modified; // include exception etags into our own etag, if exceptions are included - if ($client_shared_uid_exceptions && !empty($entry['uid']) && + if ($client_share_uid_excpetions && !empty($entry['uid']) && $entry['recur_type'] != MCAL_RECUR_NONE && $entry['recur_exception']) { $events =& $this->search(array( @@ -1911,7 +1911,7 @@ class calendar_bo } } } - //error_log(__METHOD__ . "($entry[id] ($entry[etag]): $entry[title] --> etag=$etag"); + //error_log(__METHOD__ . "($entry[id],$client_share_uid_excpetions) entry=".array2string($entry)." --> etag=$etag"); return $etag; }