diff options
| author | Aleksander Machniak <alec@alec.pl> | 2013-10-21 13:34:49 +0200 |
|---|---|---|
| committer | Aleksander Machniak <alec@alec.pl> | 2013-10-21 13:35:32 +0200 |
| commit | 8d5832fe96ec8b62efe951ff1ff7ad868f74f035 (patch) | |
| tree | 77834d22c7eb615645d047ebe05e7d48688df276 | |
| parent | 9f0bbeb7e7e4006ebb8dded601166519b5bc5bfc (diff) | |
Fix failing vCard import when email address field contains spaces (#1489386)
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | program/lib/Roundcube/rcube_vcard.php | 4 |
2 files changed, 3 insertions, 2 deletions
@@ -1,6 +1,7 @@ CHANGELOG Roundcube Webmail =========================== +- Fix failing vCard import when email address field contains spaces (#1489386) - Fix default spell-check configuration after Google suspended their spell service - Fix vulnerability in handling _session argument of utils/save-prefs (#1489382) - Fix iframe onload for upload errors handling (#1489379) diff --git a/program/lib/Roundcube/rcube_vcard.php b/program/lib/Roundcube/rcube_vcard.php index 285dc29a1..f76c4f08d 100644 --- a/program/lib/Roundcube/rcube_vcard.php +++ b/program/lib/Roundcube/rcube_vcard.php @@ -611,8 +611,8 @@ class rcube_vcard $enc = null; foreach($regs2[1] as $attrid => $attr) { + $attr = preg_replace('/[\s\t\n\r\0\x0B]/', '', $attr); if ((list($key, $value) = explode('=', $attr)) && $value) { - $value = trim($value); if ($key == 'ENCODING') { $value = strtoupper($value); // add next line(s) to value string if QP line end detected @@ -791,7 +791,7 @@ class rcube_vcard return $result; } - $s = strtr($s, $rep2); + $s = trim(strtr($s, $rep2)); } // some implementations (GMail) use non-standard backslash before colon (#1489085) |