From 92bd3a7c3f60e56ec5055c96e7b2f25637d4b0ca Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Sat, 17 Nov 2012 03:04:45 -0500
Subject: [PATCH] Fix parsing header in English when localized map is defined

---
 program/include/rcube_utils.php |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/program/include/rcube_utils.php b/program/include/rcube_utils.php
index c8457b7..5cfd8e7 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;
         }
 
@@ -764,7 +761,7 @@
             }
         }
 
-        $result[] = substr($string, $p);
+        $result[] = (string) substr($string, $p);
 
         return $result;
     }

--
Gitblit v1.9.1