c'est la merde..working

1 files changed, 1 insertions, 20 deletions

diff --git a/program/lib/Roundcube/rcube_washtml.php b/program/lib/Roundcube/rcube_washtml.php
index 8f7fe9749..f964f8b35 100644
--- a/program/lib/Roundcube/rcube_washtml.php
+++ b/program/lib/Roundcube/rcube_washtml.php
@@ -410,25 +410,6 @@ class rcube_washtml
         );
         $html = preg_replace($html_search, $html_replace, trim($html));
 
-        //-> Replace all of those weird MS Word quotes and other high characters
-        $badwordchars=array(
-            "\xe2\x80\x98", // left single quote
-            "\xe2\x80\x99", // right single quote
-            "\xe2\x80\x9c", // left double quote
-            "\xe2\x80\x9d", // right double quote
-            "\xe2\x80\x94", // em dash
-            "\xe2\x80\xa6" // elipses
-        );
-        $fixedwordchars=array(
-            "'",
-            "'",
-            '"',
-            '"',
-            '—',
-            '...'
-        );
-        $html = str_replace($badwordchars,$fixedwordchars, $html);
-
         // PCRE errors handling (#1486856), should we use something like for every preg_* use?
         if ($html === null && ($preg_error = preg_last_error()) != PREG_NO_ERROR) {
             $errstr = "Could not clean up HTML message! PCRE Error: $preg_error.";
@@ -448,7 +429,7 @@ class rcube_washtml
         }
 
         // fix (unknown/malformed) HTML tags before "wash"
-        $html = preg_replace_callback('/(<[\/]*)([^\s>]+)/', array($this, 'html_tag_callback'), $html);
+        $html = preg_replace_callback('/(<(?!\!)[\/]*)([^\s>]+)/', array($this, 'html_tag_callback'), $html);
 
         // Remove invalid HTML comments (#1487759)
         // Don't remove valid conditional comments