From a3cb04013e8cc527c88c94045e9370e8f21d2be2 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 9 Dec 2011 21:56:03 +0100
Subject: [PATCH] Update OC_VObject

---
 apps/calendar/lib/object.php | 17 +++--------------
 lib/vobject.php              |  6 ++++++
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/apps/calendar/lib/object.php b/apps/calendar/lib/object.php
index 1e834241f6..1c14500351 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/lib/vobject.php b/lib/vobject.php
index 5a76cfd2d4..e3479fc6d3 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);
 	}