From: Olivier Le Floch <olivier.le-floch@polytechnique.org>
Date: Sun, 21 Oct 2007 00:16:34 +0000 (+0200)
Subject: Do not escape address fields for Macs since that introduces '\'s when importing VCard... 
X-Git-Tag: xorg/0.9.16~265
X-Git-Url: http://git.polytechnique.org/?a=commitdiff_plain;h=62c93c739f04c20076c8a2f846ffbd859ec79bdd;p=platal.git

Do not escape address fields for Macs since that introduces '\'s when importing VCards in Address Book.  Keep old behaviour for Windows, pending reports that the same bug exists for Windows.
---

diff --git a/include/vcard.inc.php b/include/vcard.inc.php
index 5dd3b68..1a84dc8 100644
--- a/include/vcard.inc.php
+++ b/include/vcard.inc.php
@@ -141,11 +141,11 @@ class VCard
         $adr = trim("$adr\n$adr2");
         $adr = trim("$adr\n$adr3");
         return VCard::text_encode(';;'
-                . VCard::escape($adr) . ';'
-                . VCard::escape($city) . ';'
-                . VCard::escape($region) . ';'
-                . VCard::escape($postcode) . ';'
-                . VCard::escape($country), false);
+                . (VCard::$windows ? VCard::escape($adr) : $adr) . ';'
+                . (VCard::$windows ? VCard::escape($city) : $city) . ';'
+                . (VCard::$windows ? VCard::escape($region) : $region) . ';'
+                . (VCard::$windows ? VCard::escape($postcode) : $postcode) . ';'
+                . (VCard::$windows ? VCard::escape($country) : $country), false);
     }
 
     public static function text_encode($text, $escape = true)