diff options
| author | Thomas Tanghus <thomas@tanghus.net> | 2011-12-11 16:29:53 +0100 |
|---|---|---|
| committer | Thomas Tanghus <thomas@tanghus.net> | 2011-12-11 16:29:53 +0100 |
| commit | 39430c837fbb7f2626a557a90c445d030befae9b (patch) | |
| tree | faf8ad39350baeb4f732fe887f1418fc9117c382 /apps/calendar | |
| parent | c7b7758816445c400867e82f2174cdd9ef8b025c (diff) | |
| parent | 1746cba249328d92cf22bd81e367dd35dabed60c (diff) | |
| download | nextcloud-server-39430c837fbb7f2626a557a90c445d030befae9b.tar.gz nextcloud-server-39430c837fbb7f2626a557a90c445d030befae9b.zip | |
Merge git://gitorious.org/owncloud/owncloud into tanghus_remote_backup
Diffstat (limited to 'apps/calendar')
| -rw-r--r-- | apps/calendar/js/calendar.js | 5 | ||||
| -rw-r--r-- | apps/calendar/lib/object.php | 17 |
2 files changed, 5 insertions, 17 deletions
diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js index 005e359f8eb..c3644b53704 100644 --- a/apps/calendar/js/calendar.js +++ b/apps/calendar/js/calendar.js @@ -7,7 +7,6 @@ */ Calendar={ - space:' ', UI:{ startEventDialog:function(){ $('.tipsy').remove(); @@ -271,9 +270,9 @@ Calendar={ var url; if (calendarid == 'new'){ - url = "ajax/createcalendar.php"; + url = OC.filePath('calendar', 'ajax', 'createcalendar.php'); }else{ - url = "ajax/updatecalendar.php"; + url = OC.filePath('calendar', 'ajax', 'updatecalendar.php'); } $.post(url, { id: calendarid, name: displayname, active: active, description: description, color: calendarcolor }, function(data){ diff --git a/apps/calendar/lib/object.php b/apps/calendar/lib/object.php index 1e834241f63..1c145003511 100644 --- a/apps/calendar/lib/object.php +++ b/apps/calendar/lib/object.php @@ -460,7 +460,7 @@ class OC_Calendar_Object{ { $title = $request["title"]; $location = $request["location"]; - $categories = isset($request["categories"]) ? $request["categories"] : null; + $categories = isset($request["categories"]) ? $request["categories"] : array(); $allday = isset($request["allday"]); $from = $request["from"]; $to = $request["to"]; @@ -511,20 +511,9 @@ class OC_Calendar_Object{ } unset($vevent->DURATION); - $vevent->setString('LOCATION', $location); - - if($description != ""){ - $vevent->DESCRIPTION = $description; - }else{ - unset($vevent->DESCRIPTION); - } - - if(!empty($categories)){ - $vevent->CATEGORIES = join(',', $categories); - }else{ - unset($vevent->CATEGORIES); - } + $vevent->setString('DESCRIPTION', $description); + $vevent->setString('CATEGORIES', join(',', $categories)); /*if($repeat == "true"){ $vevent->RRULE = $repeat; |