fixed profind depth 0 directly on a resource contains name-part twice

This commit is contained in:
Ralf Becker 2011-10-04 12:16:03 +00:00
parent b227e61236
commit 0de2f3c527
3 changed files with 6 additions and 0 deletions

View File

@ -126,6 +126,8 @@ class addressbook_groupdav extends groupdav_handler
{ {
return false; return false;
} }
if ($id) $path = dirname($path).'/'; // carddav_name get's added anyway in the callback
if ($this->debug) error_log(__METHOD__."($path,".array2string($options).",,$user,$id) filter=".array2string($filter)); if ($this->debug) error_log(__METHOD__."($path,".array2string($options).",,$user,$id) filter=".array2string($filter));
// check if we have to return the full contact data or just the etag's // check if we have to return the full contact data or just the etag's

View File

@ -169,6 +169,8 @@ class calendar_groupdav extends groupdav_handler
// when trying to request not supported components, eg. VTODO on a calendar collection // when trying to request not supported components, eg. VTODO on a calendar collection
return true; return true;
} }
if ($id) $path = dirname($path).'/'; // caldav_name get's added anyway in the callback
if ($this->debug > 1) if ($this->debug > 1)
{ {
error_log(__METHOD__."($path,,,$user,$id) filter=".array2string($filter)); error_log(__METHOD__."($path,,,$user,$id) filter=".array2string($filter));

View File

@ -151,6 +151,8 @@ class infolog_groupdav extends groupdav_handler
// when trying to request not supported components, eg. VTODO on a calendar collection // when trying to request not supported components, eg. VTODO on a calendar collection
return true; return true;
} }
if ($id) $path = dirname($path).'/'; // caldav_name get's added anyway in the callback
if ($this->debug > 1) if ($this->debug > 1)
{ {
error_log(__METHOD__."($path,,,$user,$id) filter=". error_log(__METHOD__."($path,,,$user,$id) filter=".