Merge commit 'refs/merge-requests/57' of git://gitorious.org/owncloud/owncloud

apps/calendar/export.php

@@ -9,8 +9,8 @@
 require_once ("../../lib/base.php");
 OC_Util::checkLoggedIn();
 OC_Util::checkAppEnabled('calendar');
-$cal = $_GET["calid"];
+$cal = isset($_GET["calid"]) ? $_GET["calid"] : NULL;
-$event = $_GET["eventid"];
+$event = isset($_GET["eventid"]) ? $_GET["eventid"] : NULL;
 if(isset($cal)){
 	$calendar = OC_Calendar_Calendar::findCalendar($cal);
 	if($calendar["userid"] != OC_User::getUser()){

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',