From 58fe06586e35e8dce3d92b98ff35c94f9bb94c7c Mon Sep 17 00:00:00 2001 From: Andrew McMillan Date: Sat, 5 May 2012 17:01:40 +1200 Subject: [PATCH] When matching a URL and we have something without a trailing slash, it could also be a binding. --- inc/DAVResource.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inc/DAVResource.php b/inc/DAVResource.php index 40233426..641d1d86 100644 --- a/inc/DAVResource.php +++ b/inc/DAVResource.php @@ -429,7 +429,7 @@ FROM dav_binding EOSQL; $params = array( ':raw_path' => $this->dav_name, ':session_principal' => $session->principal_id, ':scan_depth' => $c->permission_scan_depth ); if ( !preg_match( '#/$#', $this->dav_name ) ) { - $sql .= ' OR dav_binding.dav_name = :up_to_slash OR collection.dav_name = :plus_slash '; + $sql .= ' OR dav_binding.dav_name = :up_to_slash OR collection.dav_name = :plus_slash OR dav_binding.dav_name = :plus_slash '; $params[':up_to_slash'] = preg_replace( '#[^/]*$#', '', $this->dav_name); $params[':plus_slash'] = $this->dav_name.'/'; }