diff options
| author | Jan-Christoph Borchardt <JanCBorchardt@fsfe.org> | 2011-08-30 21:01:10 +0200 |
|---|---|---|
| committer | Jan-Christoph Borchardt <JanCBorchardt@fsfe.org> | 2011-08-30 21:01:10 +0200 |
| commit | f758d223a2a813e3b2a2f05ba79c902ab10d8288 (patch) | |
| tree | 02b08663d822a8170c3a0666f0c5506f367e376c | |
| parent | 60a5581071e536defc06d9bb2290c7f4be39b8ac (diff) | |
| parent | 6ad64c6f8a0f249357baa1dd897bbef733770432 (diff) | |
| download | nextcloud-server-f758d223a2a813e3b2a2f05ba79c902ab10d8288.tar.gz nextcloud-server-f758d223a2a813e3b2a2f05ba79c902ab10d8288.zip | |
Merge branch 'calendar' of git://anongit.kde.org/owncloud into calendar
| -rwxr-xr-x | apps/calendar/ajax/newevent.php | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/apps/calendar/ajax/newevent.php b/apps/calendar/ajax/newevent.php index b51208f680a..93eaef66d17 100755 --- a/apps/calendar/ajax/newevent.php +++ b/apps/calendar/ajax/newevent.php @@ -121,11 +121,7 @@ if($errnum != 0){ exit; }else{ $data = "BEGIN:VCALENDAR\nPRODID:ownCloud Calendar\nVERSION:2.0\n"; - if(OC_Preferences::getValue(OC_USER::getUser(), "calendar", "timezone") == ""){ - $timezone = "Europe/London"; - }else{ - $timezone = OC_Preferences::getValue(OC_USER::getUser(), "calendar", "timezone"); - } + $timezone = OC_Preferences::getValue(OC_USER::getUser(), "calendar", "timezone", "Europe/London"); $created = date("Ymd") . "T" . date("His"); $data .= "BEGIN:VEVENT\n"; $data .= "CREATED:" . $created . "\nLAST-MODIFIED:" . $created . "\nDTSTAMP:" . $created . "\n"; |