X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=include%2Fvcard.inc.php;h=1a84dc8f3e461b53a226d592f7923a6587ffa589;hb=63fac48e801886b27c5b0254c16f25a5c9084071;hp=5dd3b68df69d7fdee600c6c97d1e6b0255234c05;hpb=833a7481a2ea5f95b533370ab2b30035efa38327;p=platal.git

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)