Skip to content

Commit

Permalink
[jan] Fix displayed CalDAV URLs for shared calendars in basic view to…
Browse files Browse the repository at this point in the history
…o (piper@hrz.uni-marburg.de, Bug #12380).

Conflicts:
	kronolith/docs/CHANGES
	kronolith/package.xml
  • Loading branch information
yunosh committed Aug 11, 2014
1 parent 757acf3 commit 4d5a564
Showing 1 changed file with 1 addition and 3 deletions.
4 changes: 1 addition & 3 deletions kronolith/lib/Form/EditCalendar.php
Expand Up @@ -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')
. '/';
Expand Down

0 comments on commit 4d5a564

Please sign in to comment.