diff options
| author | Thomas Bruederli <thomas@roundcube.net> | 2012-09-23 22:44:13 +0200 |
|---|---|---|
| committer | Thomas Bruederli <thomas@roundcube.net> | 2012-09-23 22:44:13 +0200 |
| commit | 0c144b98a417d50b9c073ae3931fdad47390f1f7 (patch) | |
| tree | e1a94ada7e5e06fc7c21de13dbb3f86f88634ec7 /program/include/rcube_utils.php | |
| parent | 8f098e8dead85b6512ac72b2d805314baec72a2f (diff) | |
| parent | e695162ef76054050e4181e4d28f28cf1981386b (diff) | |
Merge branch 'master' of github.com:roundcube/roundcubemail
Diffstat (limited to 'program/include/rcube_utils.php')
| -rw-r--r-- | program/include/rcube_utils.php | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/program/include/rcube_utils.php b/program/include/rcube_utils.php index c8457b7dc..2a4d4c482 100644 --- a/program/include/rcube_utils.php +++ b/program/include/rcube_utils.php @@ -250,9 +250,6 @@ class rcube_utils $out = strtr($str, $encode_arr); - // avoid douple quotation of & - $out = preg_replace('/&([A-Za-z]{2,6}|#[0-9]{2,4});/', '&\\1;', $out); - return $newlines ? nl2br($out) : $out; } |