diff options
| author | Thomas Tanghus <thomas@tanghus.net> | 2012-06-15 01:55:02 +0200 |
|---|---|---|
| committer | Thomas Tanghus <thomas@tanghus.net> | 2012-06-15 01:55:02 +0200 |
| commit | ad8c4ab182b50617a65e8fd4ed33045e99fdfdb6 (patch) | |
| tree | 4916a9fbee52f1d089814bd863847f588eeeeb02 | |
| parent | ad32c203002cbf2c02457084e40c216d06afd7f2 (diff) | |
| download | nextcloud-server-ad8c4ab182b50617a65e8fd4ed33045e99fdfdb6.tar.gz nextcloud-server-ad8c4ab182b50617a65e8fd4ed33045e99fdfdb6.zip | |
Only create new calendar when there are none. Fix oc-1007.
| -rw-r--r-- | apps/calendar/index.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/apps/calendar/index.php b/apps/calendar/index.php index eed4d98f156..4b871195927 100644 --- a/apps/calendar/index.php +++ b/apps/calendar/index.php @@ -11,7 +11,7 @@ OCP\User::checkLoggedIn(); OCP\App::checkAppEnabled('calendar'); // Create default calendar ... -$calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser(), true); +$calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser(), false); if( count($calendars) == 0){ OC_Calendar_Calendar::addCalendar(OCP\USER::getUser(),'Default calendar'); $calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser(), true); @@ -19,7 +19,9 @@ if( count($calendars) == 0){ $eventSources = array(); foreach($calendars as $calendar){ - $eventSources[] = OC_Calendar_Calendar::getEventSourceInfo($calendar); + if($calendar['active'] == 1) { + $eventSources[] = OC_Calendar_Calendar::getEventSourceInfo($calendar); + } } $eventSources[] = array('url' => '?app=calendar&getfile=ajax/events.php?calendar_id=shared_rw', 'backgroundColor' => '#1D2D44', 'borderColor' => '#888', 'textColor' => 'white', 'editable'=>'true'); |