[Pkg-owncloud-commits] [php-sabredav] 09/12: Correctly decoding paths from multiget reports.

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to tag 3.0.0-beta3
in repository php-sabredav.

commit c680c165340cec853e1abb2d6d99baf6d5e79af4
Author: Evert Pot <me at evertpot.com>
Date:   Fri May 29 13:45:21 2015 -0400

    Correctly decoding paths from multiget reports.
    
    Fixes #670.
---
 CHANGELOG.md           | 5 +++--
 lib/CalDAV/Plugin.php  | 7 ++++++-
 lib/CardDAV/Plugin.php | 6 +++++-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 04dd31e..4b687c6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,13 +1,14 @@
 ChangeLog
 =========
 
-3.0.0 (2015-??-??)
-------------------
+3.0.0-beta3 (2015-??-??)
+------------------------
 
 * Fixed deserializing href properties with no value.
 * Fixed deserializing `{DAV:}propstat` without a `{DAV:}prop`.
 * #668: More information about vcf-export-plugin in browser plugin.
 * #669: Add export button to browser plugin for address books. (@mgee)
+* #670: multiget report hrefs were not decoded.
 
 
 3.0.0-beta2 (2015-05-27)
diff --git a/lib/CalDAV/Plugin.php b/lib/CalDAV/Plugin.php
index e28a957..8afa750 100644
--- a/lib/CalDAV/Plugin.php
+++ b/lib/CalDAV/Plugin.php
@@ -424,7 +424,12 @@ class Plugin extends DAV\ServerPlugin {
         $timeZones = [];
         $propertyList = [];
 
-        foreach ($this->server->getPropertiesForMultiplePaths($report->hrefs, $report->properties) as $uri => $objProps) {
+        $paths = array_map(
+            [$this->server, 'calculateUri'],
+            $report->hrefs
+        );
+
+        foreach ($this->server->getPropertiesForMultiplePaths($paths, $report->properties) as $uri => $objProps) {
 
             if (($needsJson || $report->expand) && isset($objProps[200]['{' . self::NS_CALDAV . '}calendar-data'])) {
                 $vObject = VObject\Reader::read($objProps[200]['{' . self::NS_CALDAV . '}calendar-data']);
diff --git a/lib/CardDAV/Plugin.php b/lib/CardDAV/Plugin.php
index 61331c0..4f38f96 100644
--- a/lib/CardDAV/Plugin.php
+++ b/lib/CardDAV/Plugin.php
@@ -245,7 +245,11 @@ class Plugin extends DAV\ServerPlugin {
         );
 
         $propertyList = [];
-        foreach ($this->server->getPropertiesForMultiplePaths($report->hrefs, $report->properties) as $props) {
+        $paths = array_map(
+            [$this->server, 'calculateUri'],
+            $report->hrefs
+        );
+        foreach ($this->server->getPropertiesForMultiplePaths($paths, $report->properties) as $props) {
 
             if (isset($props['200']['{' . self::NS_CARDDAV . '}address-data'])) {
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/php-sabredav.git