From e7269e6d29463aa6e37eb5f3483b49ba6eaadd0a Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Mon, 30 Jan 2012 00:40:55 +0000 Subject: [PATCH] do NOT overwrite calendar-description set via PROPPATCH --- calendar/inc/class.calendar_groupdav.inc.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/calendar/inc/class.calendar_groupdav.inc.php b/calendar/inc/class.calendar_groupdav.inc.php index 6453dc6d19..71df245e70 100644 --- a/calendar/inc/class.calendar_groupdav.inc.php +++ b/calendar/inc/class.calendar_groupdav.inc.php @@ -7,7 +7,7 @@ * @package calendar * @subpackage groupdav * @author Ralf Becker - * @copyright (c) 2007-11 by Ralf Becker + * @copyright (c) 2007-12 by Ralf Becker * @version $Id$ */ @@ -1167,8 +1167,11 @@ class calendar_groupdav extends groupdav_handler */ public function extra_properties(array $props=array(), $displayname, $base_uri=null, $user=null) { - // calendar description - $props['calendar-description'] = HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'calendar-description',$displayname); + if (!isset($props['calendar-description'])) + { + // default calendar description: can be overwritten via PROPPATCH, in which case it's already set + $props['calendar-description'] = HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'calendar-description',$displayname); + } // supported components, currently only VEVENT $props['supported-calendar-component-set'] = HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'supported-calendar-component-set',array( HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'comp',array('name' => 'VCALENDAR')),