Contacts: Fix NOTE also on add, not just save.

diff --git a/apps/contacts/ajax/addproperty.php b/apps/contacts/ajax/addproperty.php
index 42b0c782035428aa7f160380d1cc2f8664cf0434..94e09bac19098b9d35094d202eb5ef32311c6a5f 100644 (file)
--- a/apps/contacts/ajax/addproperty.php
+++ b/apps/contacts/ajax/addproperty.php
@@ -82,6 +82,7 @@ if(is_array($value)) {
        $value = strip_tags($value);
 }
 
+/* preprocessing value */
 switch($name) {
        case 'BDAY':
                $date = New DateTime($value);
@@ -94,6 +95,8 @@ switch($name) {
        case 'N':
        case 'ORG':
        case 'NOTE':
+               $value = str_replace('\n', ' \\n', $value);
+               break;
        case 'NICKNAME':
                // TODO: Escape commas and semicolons.
                break;
@@ -105,8 +108,14 @@ switch($name) {
                break;
 }
 
-
-$property = $vcard->addProperty($name, $value); //, $parameters);
+switch($name) {
+       case 'NOTE':
+               $vcard->setString('NOTE', $value);
+               break;
+       default:
+               $property = $vcard->addProperty($name, $value); //, $parameters);
+               break;
+}
 
 $line = count($vcard->children) - 1;