fixed etag for series not containing etag's of exceptions

This commit is contained in:
Ralf Becker 2011-03-24 22:18:30 +00:00
parent 4fcd8a40bb
commit bd6889657e

View File

@ -1893,7 +1893,7 @@ class calendar_bo
} }
$etag .= ':' . $modified; $etag .= ':' . $modified;
// include exception etags into our own etag, if exceptions are included // 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']) $entry['recur_type'] != MCAL_RECUR_NONE && $entry['recur_exception'])
{ {
$events =& $this->search(array( $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; return $etag;
} }