diff options
| author | Georg Ehrke <ownclouddev@georgswebsite.de> | 2011-11-12 15:13:44 +0100 |
|---|---|---|
| committer | Georg Ehrke <ownclouddev@georgswebsite.de> | 2011-11-12 15:13:44 +0100 |
| commit | 7fd52de2d3284cfca32bf7a9a6b9b3709f8660bc (patch) | |
| tree | 9ce3273cf87a302678d01197f50f15a52e1027e9 /apps/calendar/index.php | |
| parent | c40383b6102130ca1e94a9ce2afe48af4d0ffc81 (diff) | |
| parent | ef124c3e21ceae49f0f704589a833d1208d99c65 (diff) | |
| download | nextcloud-server-7fd52de2d3284cfca32bf7a9a6b9b3709f8660bc.tar.gz nextcloud-server-7fd52de2d3284cfca32bf7a9a6b9b3709f8660bc.zip | |
fix merge conflicts
Diffstat (limited to 'apps/calendar/index.php')
| -rw-r--r-- | apps/calendar/index.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/calendar/index.php b/apps/calendar/index.php index 2442d27db49..1129bdcf7fd 100644 --- a/apps/calendar/index.php +++ b/apps/calendar/index.php @@ -12,8 +12,8 @@ OC_Util::checkAppEnabled('calendar'); // Create default calendar ... $calendars = OC_Calendar_Calendar::allCalendars(OC_User::getUser(), 1); if( count($calendars) == 0){ - OC_Calendar_Calendar::addCalendar(OC_User::getUser(),'default','Default calendar'); - $calendars = OC_Calendar_Calendar::allCalendars(OC_User::getUser(), 1); + OC_Calendar_Calendar::addCalendar(OC_User::getUser(),'Default calendar'); + $calendars = OC_Calendar_Calendar::allCalendars(OC_User::getUser()); } $eventSources = array(); foreach($calendars as $calendar){ |