From 4d5a564c882e0ea08df2632fb2a4b393f8250652 Mon Sep 17 00:00:00 2001 From: Jan Schneider Date: Mon, 11 Aug 2014 13:01:49 +0200 Subject: [PATCH] [jan] Fix displayed CalDAV URLs for shared calendars in basic view too (piper@hrz.uni-marburg.de, Bug #12380). Conflicts: kronolith/docs/CHANGES kronolith/package.xml --- kronolith/lib/Form/EditCalendar.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/kronolith/lib/Form/EditCalendar.php b/kronolith/lib/Form/EditCalendar.php index e65a04f6754..692f67d9330 100644 --- a/kronolith/lib/Form/EditCalendar.php +++ b/kronolith/lib/Form/EditCalendar.php @@ -88,9 +88,7 @@ public function __construct($vars, $calendar) $accountUrl = Horde::url($accountUrl, true, -1) . 'principals/'. $GLOBALS['registry']->getAuth() . '/'; $caldavUrl = Horde::url($caldavUrl, true, -1) - . ($calendar->get('owner') - ? $calendar->get('owner') - : '-system-') + . $GLOBALS['registry']->getAuth() . '/' . $GLOBALS['injector']->getInstance('Horde_Dav_Storage')->getExternalCollectionId($calendar->getName(), 'calendar') . '/';