From 7f64d7c2e4a38870eb225e6dcb15f60a7af63bfc Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Thu, 04 Oct 2012 04:03:09 -0400
Subject: [PATCH] Merge branch 'master' of github.com:roundcube/roundcubemail
---
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 c8457b7..2a4d4c4 100644
--- a/program/include/rcube_utils.php
+++ b/program/include/rcube_utils.php
@@ -250,9 +250,6 @@
$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;
}
--
Gitblit v1.9.1