From 6d49488a7bd93416e49243af898696a2e95090a4 Mon Sep 17 00:00:00 2001
From: Andrew McMillan <andrew@morphoss.com>
Date: Fri, 24 Sep 2010 12:14:05 +1200
Subject: [PATCH] Fix fetching of resource by path to work with addressbook
 resources also.

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

diff --git a/inc/DAVResource.php b/inc/DAVResource.php
index baf583f8..2f0624e6 100644
--- a/inc/DAVResource.php
+++ b/inc/DAVResource.php
@@ -505,7 +505,9 @@ EOSQL;
     if ( $this->_is_collection ) return;   // We have all we're going to read
 
     $sql = <<<EOQRY
-SELECT * FROM caldav_data LEFT JOIN calendar_item USING (collection_id,dav_id)
+SELECT calendar_item.*, addressbook_resource.*, caldav_data.*
+     FROM caldav_data LEFT JOIN calendar_item USING (collection_id,dav_id)
+                       LEFT JOIN addressbook_resource USING (dav_id)
      WHERE caldav_data.dav_name = :dav_name
 EOQRY;
     $params = array( ':dav_name' => $this->bound_from() );