From dfad00f93887508fc4ab1128b222580e380d911c Mon Sep 17 00:00:00 2001 From: Andrew McMillan Date: Sun, 10 Dec 2006 18:56:49 +1300 Subject: [PATCH] Since we may not always get a creation date out of the iCalendar entry we sometimes need to use the database creation time of the entry. --- inc/caldav-PROPFIND.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/inc/caldav-PROPFIND.php b/inc/caldav-PROPFIND.php index 9278b003..3c1e8910 100644 --- a/inc/caldav-PROPFIND.php +++ b/inc/caldav-PROPFIND.php @@ -262,7 +262,7 @@ function get_collection_contents( $depth, $user_no, $collection ) { dbg_error_log("PROPFIND","Getting collection items: Depth %d, User: %d, Path: %s", $depth, $user_no, $collection->dav_name ); $sql = "SELECT caldav_data.dav_name, caldav_data, caldav_data.dav_etag, "; - $sql .= "to_char(calendar_item.created at time zone 'GMT',?) AS created, "; + $sql .= "to_char(coalesce(calendar_item.created, caldav_data.created) at time zone 'GMT',?) AS created, "; $sql .= "to_char(last_modified at time zone 'GMT',?) AS modified, "; $sql .= "summary AS dav_displayname "; $sql .= "FROM caldav_data JOIN calendar_item USING( user_no, dav_name) WHERE dav_name ~ ".qpg('^'.$collection->dav_name.'[^/]+$'); @@ -338,7 +338,7 @@ function get_item( $item_path ) { dbg_error_log("PROPFIND","Getting item: Path: %s", $item_path ); $sql = "SELECT caldav_data.dav_name, caldav_data, caldav_data.dav_etag, "; - $sql .= "to_char(calendar_item.created at time zone 'GMT',?) AS created, "; + $sql .= "to_char(coalesce(calendar_item.created, caldav_data.created) at time zone 'GMT',?) AS created, "; $sql .= "to_char(last_modified at time zone 'GMT',?) AS modified, "; $sql .= "summary AS dav_displayname "; $sql .= "FROM caldav_data JOIN calendar_item USING( user_no, dav_name) WHERE dav_name = ?;";