Changeset 2248 in subversion

Timestamp:

Jan 21, 2009 2:55:09 AM (4 years ago)

Author:

alec

Message:

• Fix html entities replacement (related to r2186)

File:

• trunk/roundcubemail/program/lib/html2text.php (modified) (3 diffs)

trunk/roundcubemail/program/lib/html2text.php

@@ -177 +177 @@
         '/&(pound|#163);/i',                     // Pound sign
         '/&(euro|#8364);/i',                     // Euro sign
-        '/&[^&;]+;/i',                           // Unknown/unhandled entities
         '/[ ]{2,}/'                              // Runs of spaces, post-handling
     );
@@ -221 +220 @@
         '£',
         'EUR',                                  // Euro sign. € ?
-        '',                                     // Unknown/unhandled entities
         ' '                                     // Runs of spaces, post-handling
     );
@@ -475 +473 @@
         // Replace known html entities
         $text = html_entity_decode($text, ENT_COMPAT, 'UTF-8');
+
+        // Remove unknown/unhandled entities (this cannot be done in search-and-replace block)
+        $text = preg_replace('/&[^&;]+;/i', '', $text); 
 
         // Strip any other HTML tags