diff options
author | Aleksander Machniak <alec@alec.pl> | 2012-09-21 10:11:49 +0200 |
---|---|---|
committer | Aleksander Machniak <alec@alec.pl> | 2012-09-21 10:11:49 +0200 |
commit | 824c1121e78e91e36953f241a02c94094c6ea21f (patch) | |
tree | c25acd368eda4524111139c2f1a2478f1cab46cd /program/include/rcube_utils.php | |
parent | 74e6cf2f58a663b50a9b443dd815e44451f7d770 (diff) | |
parent | 1b9923208c64f4d3494e185ac3d249df5fbb8552 (diff) |
Merge branch 'html_ent'
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 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('/&([A-Za-z]{2,6}|#[0-9]{2,4});/', '&\\1;', $out); - return $newlines ? nl2br($out) : $out; } |