From 824c1121e78e91e36953f241a02c94094c6ea21f Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Fri, 21 Sep 2012 04:11:49 -0400
Subject: [PATCH] Merge branch 'html_ent'

---
 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 b278431..bf2b0db 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