From e1eff9abbfc9c33f70581f69febe4697d8e72310 Mon Sep 17 00:00:00 2001
From: Andrew McMillan <debian@mcmillan.net.nz>
Date: Wed, 22 Oct 2008 20:51:30 +1300
Subject: [PATCH] Response data is always in the 'data' part, for consistency
 between event & todo.

---
 inc/caldav-client.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/inc/caldav-client.php b/inc/caldav-client.php
index ea107bb6..ddfb6c3d 100644
--- a/inc/caldav-client.php
+++ b/inc/caldav-client.php
@@ -337,7 +337,7 @@ EOXML;
           break;
         case 'URN:IETF:PARAMS:XML:NS:CALDAV:CALENDAR-DATA':
           $response['data'] = $v['value'];
-          $response[$report_type] = $v['value'];  // deprecated - will be removed.  Just use 'data' please :-)
+          if ( $report_type != 'data' ) $response[$report_type] = $v['value'];  // deprecated - will be removed.  Just use 'data' please :-)
           break;
       }
     }
@@ -373,7 +373,7 @@ EOXML;
 EOFILTER;
     }
 
-    return DoCalendarQuery($filter, $relative_url, 'event');
+    return DoCalendarQuery($filter, $relative_url);
   }
 
 
@@ -419,7 +419,7 @@ EOTIME;
   </C:filter>
 EOFILTER;
 
-    return DoCalendarQuery($filter, $relative_url, 'todo');
+    return DoCalendarQuery($filter, $relative_url);
   }