diff options
| author | Georg Ehrke <ownclouddev@georgswebsite.de> | 2011-12-03 17:25:17 +0100 |
|---|---|---|
| committer | Georg Ehrke <ownclouddev@georgswebsite.de> | 2011-12-03 17:25:17 +0100 |
| commit | 361d4ac13b1f951e7c9f8ca530feab33dfdcf3a1 (patch) | |
| tree | 01fc46918ee326fdef8aa919d927b54e6a0885c4 /apps/calendar/index.php | |
| parent | 7fd52de2d3284cfca32bf7a9a6b9b3709f8660bc (diff) | |
| parent | 31846141b0269bb24b9925a1bbbbc5d815719bec (diff) | |
| download | nextcloud-server-361d4ac13b1f951e7c9f8ca530feab33dfdcf3a1.tar.gz nextcloud-server-361d4ac13b1f951e7c9f8ca530feab33dfdcf3a1.zip | |
fix merge conflicts
Diffstat (limited to 'apps/calendar/index.php')
| -rw-r--r-- | apps/calendar/index.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/apps/calendar/index.php b/apps/calendar/index.php index 1129bdcf7fd..7561f987b21 100644 --- a/apps/calendar/index.php +++ b/apps/calendar/index.php @@ -13,7 +13,7 @@ OC_Util::checkAppEnabled('calendar'); $calendars = OC_Calendar_Calendar::allCalendars(OC_User::getUser(), 1); if( count($calendars) == 0){ OC_Calendar_Calendar::addCalendar(OC_User::getUser(),'Default calendar'); - $calendars = OC_Calendar_Calendar::allCalendars(OC_User::getUser()); + $calendars = OC_Calendar_Calendar::allCalendars(OC_User::getUser(), 1); } $eventSources = array(); foreach($calendars as $calendar){ @@ -32,6 +32,9 @@ if(OC_Preferences::getValue(OC_USER::getUser(), 'calendar', 'currentview', 'mont OC_Util::addScript('3rdparty/fullcalendar', 'fullcalendar'); OC_Util::addStyle('3rdparty/fullcalendar', 'fullcalendar'); +if(OC_Preferences::getValue(OC_USER::getUser(), "calendar", "timezone") == null){ + OC_UTIL::addScript('calendar', 'geo'); +} OC_Util::addScript('calendar', 'calendar'); OC_Util::addStyle('calendar', 'style'); OC_Util::addScript('', 'jquery.multiselect'); |