Changeset 4028 in subversion

Timestamp:

Oct 1, 2010 4:08:05 AM (3 years ago)

Author:

alec

Message:

• Fix handling of Thunderbird's vCards (#1487024)

Location:

trunk/roundcubemail

Files:

• CHANGELOG (modified) (1 diff)
• program/include/rcube_vcard.php (modified) (2 diffs)

trunk/roundcubemail/CHANGELOG

@@ -16 +16 @@
 - Fix: contact group input is empty when using rename action more than once on the same group record
 - Fix "Server Error! (Not Found)" when using utils/save-pref action (#1487023)
+- Fix handling of Thunderbird's vCards (#1487024)
 
 RELEASE 0.4.1

trunk/roundcubemail/program/include/rcube_vcard.php

@@ -219 +219 @@
         $vcard_block .= $line . "\n";
 
-      if (trim($line) == 'END:VCARD') {
+      $line = trim($line);
+
+      if (preg_match('/^END:VCARD$/i', $line)) {
         // parse vcard
         $obj = new rcube_vcard(self::cleanup($vcard_block), $charset);
@@ -227 +229 @@
         $in_vcard_block = false;
       }
-      else if (trim($line) == 'BEGIN:VCARD') {
+      else if (preg_match('/^BEGIN:VCARD$/i', $line)) {
         $vcard_block = $line . "\n";
         $in_vcard_block = true;