From 2e19bbb535bfd1b2e2e53af567d943a809a46d68 Mon Sep 17 00:00:00 2001
From: Andrew McMillan <andrew@morphoss.com>
Date: Sun, 8 Jul 2012 22:52:13 +1200
Subject: [PATCH] Avoid double-encoding URLs.

---
 inc/DAVResource.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/inc/DAVResource.php b/inc/DAVResource.php
index b10b1132..ee1d034c 100644
--- a/inc/DAVResource.php
+++ b/inc/DAVResource.php
@@ -1633,13 +1633,13 @@ EOQRY;
           $reply->DAVElement( $prop, 'owner', $reply->href( ConstructURL($this->collection->bound_from )) );
         }
         else {
-          $reply->DAVElement( $prop, 'owner', $reply->href( ConstructURL($this->principal_url()) ) );
+          $reply->DAVElement( $prop, 'owner', $reply->href( ConstructURL(rawurldecode($this->principal_url())) ) );
         }
         break;
 
       case 'DAV::add-member':
         if ( ! $this->_is_collection ) return false;
-        $reply->DAVElement( $prop, 'add-member', $reply->href(ConstructURL($this->url()).'?add-member') );
+        $reply->DAVElement( $prop, 'add-member', $reply->href(ConstructURL(rawurldecode($this->url())).'?add-member') );
         break;
 
       // Empty tag responses.