do NOT overwrite calendar-description set via PROPPATCH

This commit is contained in:
Ralf Becker 2012-01-30 00:40:55 +00:00
parent fb16ff842d
commit e7269e6d29

View File

@ -7,7 +7,7 @@
* @package calendar * @package calendar
* @subpackage groupdav * @subpackage groupdav
* @author Ralf Becker <RalfBecker-AT-outdoor-training.de> * @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
* @copyright (c) 2007-11 by Ralf Becker <RalfBecker-AT-outdoor-training.de> * @copyright (c) 2007-12 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
* @version $Id$ * @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) public function extra_properties(array $props=array(), $displayname, $base_uri=null, $user=null)
{ {
// calendar description if (!isset($props['calendar-description']))
$props['calendar-description'] = HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'calendar-description',$displayname); {
// 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 // supported components, currently only VEVENT
$props['supported-calendar-component-set'] = HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'supported-calendar-component-set',array( $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')), HTTP_WebDAV_Server::mkprop(groupdav::CALDAV,'comp',array('name' => 'VCALENDAR')),