From 344e3cb9a1ffe8d94b1f21f5643b9575dd8210e3 Mon Sep 17 00:00:00 2001 From: Andrew McMillan Date: Sun, 10 Oct 2010 01:51:31 -0400 Subject: [PATCH] Ensure there are spaces in the SQL for CardDAV. --- inc/caldav-REPORT-multiget.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/inc/caldav-REPORT-multiget.php b/inc/caldav-REPORT-multiget.php index 7631d5fb..efaf31e0 100644 --- a/inc/caldav-REPORT-multiget.php +++ b/inc/caldav-REPORT-multiget.php @@ -76,15 +76,15 @@ foreach( $mg_hrefs AS $k => $v ) { } $where = " WHERE caldav_data.collection_id = " . $collection->resource_id(); -$where .= "AND caldav_data.dav_name IN ( $href_in ) "; +$where .= " AND caldav_data.dav_name IN ( $href_in ) "; if ( $mode == 'caldav' ) { if ( $collection->Privileges() != privilege_to_bits('DAV::all') ) { - $where .= "AND (calendar_item.class != 'PRIVATE' OR calendar_item.class IS NULL) "; + $where .= " AND (calendar_item.class != 'PRIVATE' OR calendar_item.class IS NULL) "; } if ( isset($c->hide_TODO) && $c->hide_TODO && ! $collection->Privileges() == privilege_to_bits('all') ) { - $where .= "AND caldav_data.caldav_type NOT IN ('VTODO') "; + $where .= " AND caldav_data.caldav_type NOT IN ('VTODO') "; } $sql = 'SELECT caldav_data.*,calendar_item.* FROM caldav_data LEFT JOIN calendar_item USING(dav_id, user_no, dav_name, collection_id)