From 0c144b98a417d50b9c073ae3931fdad47390f1f7 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Sun, 23 Sep 2012 16:44:13 -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('/&amp;([A-Za-z]{2,6}|#[0-9]{2,4});/', '&\\1;', $out);
-
             return $newlines ? nl2br($out) : $out;
         }
 

--
Gitblit v1.9.1