Merge git://gitorious.org/owncloud/owncloud into tanghus_remote_backup

5 files changed, 12 insertions, 27 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;
diff --git a/apps/gallery/css/styles.css b/apps/gallery/css/styles.css
index 070effe3a92..e23d822fec7 100644
--- a/apps/gallery/css/styles.css
+++ b/apps/gallery/css/styles.css
@@ -13,6 +13,7 @@ div#gallery_album_box {
   border: 0;
   display: inline-block;
   margin: 5pt;
+  vertical-align: top;
 }
 .leftcontent div#gallery_album_box {
   margin: 5px;
diff --git a/lib/updater.php b/lib/updater.php
index e4db719a62c..cc4a4602539 100644
--- a/lib/updater.php
+++ b/lib/updater.php
@@ -52,13 +52,9 @@ class OC_Updater{
                 $tmp['url'] = $data->url;
                 $tmp['web'] = $data->web;
 
-
                 return $tmp;
-
 	}
 
-
-
 	public static function ShowUpdatingHint(){
 		$data=OC_Updater::check();
 		if(isset($data['version']) and $data['version']<>'') {
@@ -67,10 +63,8 @@ class OC_Updater{
 			$txt='Your ownCloud is up to date';
 		}
 		return($txt);
-
 	}
 
-
 	/**
 	 * do ownCloud update
 	 */
@@ -83,9 +77,5 @@ class OC_Updater{
 		//update version in config
 
 	}
-
 }
-
-
-
 ?>
diff --git a/lib/vobject.php b/lib/vobject.php
index 5a76cfd2d43..e3479fc6d36 100644
--- a/lib/vobject.php
+++ b/lib/vobject.php
@@ -48,6 +48,7 @@ class OC_VObject{
 			}
 			return $vobject;
 		} catch (Exception $e) {
+			OC_Log::write('vobject', $e->getMessage(), OC_Log::ERROR);
 			return null;
 		}
 	}
@@ -132,6 +133,7 @@ class OC_VObject{
 
 	public function setString($name, $string){
 		if ($string != ''){
+			$string = strtr($string, array("\r\n"=>"\n"));
 			$this->vobject->__set($name, $string);
 		}else{
 			$this->vobject->__unset($name);
@@ -195,6 +197,10 @@ class OC_VObject{
 		return $this->vobject->__unset($name);
 	}
 
+	public function __isset($name){
+		return $this->vobject->__isset($name);
+	}
+
 	public function __call($function,$arguments){
 		return call_user_func_array(array($this->vobject, $function), $arguments);
 	}