diff options
| author | Robin Appelman <icewind1991@gmail.com> | 2011-10-14 20:38:42 +0200 |
|---|---|---|
| committer | Robin Appelman <icewind1991@gmail.com> | 2011-10-14 20:38:42 +0200 |
| commit | 8450785379d7ef2a192b9d21857a48662e370d5b (patch) | |
| tree | 745746b0cd71f5e00d52be27cc362f098c93f9f0 /apps | |
| parent | 9a5af50f32d59858a324eb013781155341cb4972 (diff) | |
| parent | c86d1824fef70766f1f04a7f3ce2c118c411e037 (diff) | |
| download | nextcloud-server-8450785379d7ef2a192b9d21857a48662e370d5b.tar.gz nextcloud-server-8450785379d7ef2a192b9d21857a48662e370d5b.zip | |
Merge commit 'refs/merge-requests/57' of git://gitorious.org/owncloud/owncloud
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/calendar/export.php | 4 | ||||
| -rw-r--r-- | apps/calendar/lib/connector_sabre.php | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/apps/calendar/export.php b/apps/calendar/export.php index b3e5ecd6834..3e93a1ad618 100644 --- a/apps/calendar/export.php +++ b/apps/calendar/export.php @@ -9,8 +9,8 @@ require_once ("../../lib/base.php"); OC_Util::checkLoggedIn(); OC_Util::checkAppEnabled('calendar'); -$cal = $_GET["calid"]; -$event = $_GET["eventid"]; +$cal = isset($_GET["calid"]) ? $_GET["calid"] : NULL; +$event = isset($_GET["eventid"]) ? $_GET["eventid"] : NULL; if(isset($cal)){ $calendar = OC_Calendar_Calendar::findCalendar($cal); if($calendar["userid"] != OC_User::getUser()){ diff --git a/apps/calendar/lib/connector_sabre.php b/apps/calendar/lib/connector_sabre.php index 13a542fccad..263fb7ffde5 100644 --- a/apps/calendar/lib/connector_sabre.php +++ b/apps/calendar/lib/connector_sabre.php @@ -10,7 +10,6 @@ class OC_Connector_Sabre_CalDAV extends Sabre_CalDAV_Backend_Abstract { */ public $propertyMap = array( '{DAV:}displayname' => 'displayname', - '{urn:ietf:params:xml:ns:caldav}calendar-description' => 'description', '{urn:ietf:params:xml:ns:caldav}calendar-timezone' => 'timezone', '{http://apple.com/ns/ical/}calendar-order' => 'calendarorder', '{http://apple.com/ns/ical/}calendar-color' => 'calendarcolor', |