From e8a2b6fc7403a971fdeaccb6e3ec4501bb7bb873 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 10 Mar 2013 12:49:36 +0100
Subject: [PATCH] Contacts: Avoid double escaping on serialize.

---
 lib/vobject/stringproperty.php | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/lib/vobject/stringproperty.php b/lib/vobject/stringproperty.php
index 3466ca1c..daf3c2ba 100644
--- a/lib/vobject/stringproperty.php
+++ b/lib/vobject/stringproperty.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * ownCloud - VCard component
+ * ownCloud - VObject String Property
  *
  * This component represents the BEGIN:VCARD and END:VCARD found in every
  * vcard.
@@ -50,16 +50,19 @@ class StringProperty extends VObject\Property {
 		}
 
 		$src = array(
-			"\n",);
-		/*	';',
+			'\\',
+			"\n",
+			';',
 			',',
-		);*/
+		);
 		$out = array(
-			'\n',);
-		/*	'\;',
+			'\\\\',
+			'\n',
+			'\;',
 			'\,',
-		);*/
-		$str.=':' . str_replace($src, $out, $this->value);
+		);
+		$value = strtr($this->value, array('\,' => ',', '\;' => ';', '\\\\' => '\\'));
+		$str.=':' . str_replace($src, $out, $value);
 
 		$out = '';
 		while(strlen($str) > 0) {