From 13fddbade8f299931e1e345fde8ee1d057f74357 Mon Sep 17 00:00:00 2001
From: Andrew McMillan <andrew@morphoss.com>
Date: Sat, 27 Mar 2010 17:01:12 +1300
Subject: [PATCH] Fix display of ~username path in response.

---
 inc/CalDAVPrincipal.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/inc/CalDAVPrincipal.php b/inc/CalDAVPrincipal.php
index b1409429..6b1f4281 100644
--- a/inc/CalDAVPrincipal.php
+++ b/inc/CalDAVPrincipal.php
@@ -180,7 +180,8 @@ class CalDAVPrincipal
     $this->exists = true;
     $this->InitialiseRecord($usr);
 
-    if ( is_array($parameters) && isset($parameters['path']) && preg_match('#^/principals/#', $parameters['path']) ) {
+    if ( is_array($parameters) && !isset($parameters['username']) && !isset($parameters['user_no'])
+                 && isset($parameters['path']) && preg_match('{^/(~|principals/)}', $parameters['path']) ) {
       // Force it to match
       $this->url = $parameters['path'];
       $this->dav_name = $parameters['path'];