From b55e69399f1027aa724999a1adc69cc967dd848d Mon Sep 17 00:00:00 2001 From: Andrew McMillan Date: Fri, 16 Apr 2010 12:47:18 +1200 Subject: [PATCH] Switch to put caldav_data.* in result list after calendar_item.* --- inc/caldav-PROPFIND.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/inc/caldav-PROPFIND.php b/inc/caldav-PROPFIND.php index 484e69af..5333c1b2 100644 --- a/inc/caldav-PROPFIND.php +++ b/inc/caldav-PROPFIND.php @@ -185,11 +185,10 @@ function get_collection_contents( $depth, $collection, $parent_path = null ) { $time_limit_clause = " AND calendar_item.dtstart > (now() - interval '".intval($c->hide_older_than)." days') "; } - $sql = 'SELECT collection.*, principal.*, caldav_data.*, caldav_data, '; + $sql = 'SELECT collection.*, principal.*, calendar_item.*, caldav_data.*, '; $sql .= "to_char(coalesce(calendar_item.created, caldav_data.created) at time zone 'GMT',$date_format) AS created, "; $sql .= "to_char(last_modified at time zone 'GMT',$date_format) AS modified, "; - $sql .= 'summary AS dav_displayname, '; - $sql .= 'calendar_item.* '; + $sql .= 'summary AS dav_displayname '; $sql .= 'FROM caldav_data LEFT JOIN calendar_item USING( dav_id, user_no, dav_name, collection_id) '; $sql .= 'LEFT JOIN collection USING(collection_id,user_no) LEFT JOIN principal USING(user_no) '; $sql .= 'WHERE collection.dav_name = :collection_dav_name '.$time_limit_clause.' '.$privacy_clause;