diff options
Diffstat (limited to 'program/lib/Roundcube/rcube_vcard.php')
| -rw-r--r-- | program/lib/Roundcube/rcube_vcard.php | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/program/lib/Roundcube/rcube_vcard.php b/program/lib/Roundcube/rcube_vcard.php index e6fa5b248..c2b30af59 100644 --- a/program/lib/Roundcube/rcube_vcard.php +++ b/program/lib/Roundcube/rcube_vcard.php @@ -770,15 +770,21 @@ class rcube_vcard */ private static function vcard_unquote($s, $sep = ';') { - // break string into parts separated by $sep, but leave escaped $sep alone - if (count($parts = explode($sep, strtr($s, array("\\$sep" => "\007")))) > 1) { - foreach($parts as $s) { - $result[] = self::vcard_unquote(strtr($s, array("\007" => "\\$sep")), $sep); + // break string into parts separated by $sep + if (!empty($sep)) { + // Handle properly backslash escaping (#1488896) + $rep1 = array("\\\\" => "\010", "\\$sep" => "\007"); + $rep2 = array("\007" => "\\$sep", "\010" => "\\\\"); + + if (count($parts = explode($sep, strtr($s, $rep1))) > 1) { + foreach ($parts as $s) { + $result[] = self::vcard_unquote(strtr($s, $rep2)); + } + return $result; } - return $result; } - return strtr($s, array("\r" => '', '\\\\' => '\\', '\n' => "\n", '\N' => "\n", '\,' => ',', '\;' => ';', '\:' => ':')); + return strtr($s, array("\r" => '', '\\\\' => '\\', '\n' => "\n", '\N' => "\n", '\,' => ',', '\;' => ';')); } /** |