Changeset 5c4c066 in github

Timestamp:

Apr 14, 2011 8:46:09 AM (2 years ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

569f830

Parents:

ae1db223

Message:

• Fixed vcard folding: use one space, use mb_regex_encoding() (#1487868)

Location:

program/include

Files:

• iniset.php (modified) (1 diff)
• rcube_vcard.php (modified) (1 diff)

program/include/iniset.php

@@ -75 +75 @@
 
 // set internal encoding for mbstring extension
-if(extension_loaded('mbstring'))
+if (extension_loaded('mbstring')) {
     mb_internal_encoding(RCMAIL_CHARSET);
-
+    @mb_regex_encoding(RCMAIL_CHARSET);
+}
 
 /**

program/include/rcube_vcard.php

@@ -468 +468 @@
     // use mb string function if available
     if (function_exists('mb_ereg_replace')) {
-      return ":\n  " . mb_ereg_replace('(.{70})', "\\1\n  ", $matches[1]);
+      return ":\n " . mb_ereg_replace('(.{70})', "\\1\n ", $matches[1]);
     }
     
     // chunk_split string and avoid lines breaking multibyte characters
     $c = 66;
-    $out = ":\n  " . substr($matches[1], 0, $c);
+    $out = ":\n " . substr($matches[1], 0, $c);
     for ($n = $c; $c < strlen($matches[1]); $c++) {
       // break if length > 70 or mutlibyte character starts after position 66
       if ($n > 70 || ($n > 66 && ord($matches[1][$c]) >> 6 == 3)) {
-        $out .= "\n  ";
+        $out .= "\n ";
         $n = 0;
       }