summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2012-09-17 14:22:44 +0200
committerAleksander Machniak <alec@alec.pl>2012-09-17 14:22:44 +0200
commit649cc19cfc0be218719e106680eba908bbb3d583 (patch)
treed504d69dc44ab3be2d35ec27843798a962e8f233
parent32ba62889c1def94f555c3e683fc8087ee16c9b3 (diff)
Fix HTML special characters handling in message list/header display (#1488523)
-rw-r--r--CHANGELOG1
-rw-r--r--program/include/rcube_utils.php3
2 files changed, 1 insertions, 3 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 8a010a4d0..61eced8f3 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG Roundcube Webmail
===========================
+- Fix HTML special characters handling in message list/header display (#1488523)
- List related text/html part as attachment in plain text mode (#1488677)
- Use IMAP BINARY (RFC3516) extension to fetch message/part bodies
- Fix folder creation under public namespace root (#1488665)
diff --git a/program/include/rcube_utils.php b/program/include/rcube_utils.php
index b278431a6..bf2b0db54 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('/&amp;([A-Za-z]{2,6}|#[0-9]{2,4});/', '&\\1;', $out);
-
return $newlines ? nl2br($out) : $out;
}