From dd1d3903ff39611ad247e0160f616ac6c3405332 Mon Sep 17 00:00:00 2001
From: Andrew McMillan <andrew@morphoss.com>
Date: Thu, 23 Sep 2010 23:21:11 +1200
Subject: [PATCH] Make the sync report work with non-calendar resources.

---
 inc/caldav-REPORT-sync-collection.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/inc/caldav-REPORT-sync-collection.php b/inc/caldav-REPORT-sync-collection.php
index 469d06ce..b58af699 100644
--- a/inc/caldav-REPORT-sync-collection.php
+++ b/inc/caldav-REPORT-sync-collection.php
@@ -56,11 +56,12 @@ EOSQL;
 }
 else {
   $sql = <<<EOSQL
-SELECT collection.*, caldav_data.*, calendar_item.*, sync_changes.*
+SELECT collection.*, calendar_item.*, caldav_data.*, addressbook_resource.*, sync_changes.*
   FROM collection LEFT JOIN sync_changes USING(collection_id)
-                         LEFT JOIN calendar_item USING (collection_id,dav_id)
                          LEFT JOIN caldav_data USING (collection_id,dav_id)
-     WHERE collection.collection_id = :collection_id
+                         LEFT JOIN calendar_item USING (collection_id,dav_id)
+                         LEFT JOIN addressbook_resource USING (dav_id)
+                         WHERE collection.collection_id = :collection_id
        AND sync_time > (SELECT modification_time FROM sync_tokens WHERE sync_token = :sync_token)
    ORDER BY collection.collection_id, sync_changes.dav_name, sync_changes.sync_time
 EOSQL;