Changeset 2190 in subversion

Timestamp:

Dec 27, 2008 2:45:49 PM (4 years ago)

Author:

alec

Message:

#1485647: handle PRE_TEXT tags in html messages (+ small fixes)

File:

• trunk/roundcubemail/program/steps/mail/func.inc (modified) (2 diffs)

trunk/roundcubemail/program/steps/mail/func.inc

@@ -643 +643 @@
     $html_search = array(
       '/(<\/nobr>)(\s+)(<nobr>)/i',     // space(s) between <NOBR>
-    '/(<[\/]*st1:[^>]+>)/i',    // Microsoft's Smart Tags <ST1>
-    '/<title>.*<\/title>/i',    // PHP bug #32547 workaround: remove title tag
-    '/<html[^>]*>/im',          // malformed html: remove html tags (#1485139)
-    '/<\/html>/i',                      // malformed html: remove html tags (#1485139)
-    '/^[\xFE\xFF\xBB\xBF\x00]+((?:<\!doctype|\<html))/im',      // remove byte-order mark (only outlook?)
+      '/(<[\/]*st1:[^>]+>)/i',          // Microsoft's Smart Tags <ST1>
+      '/<\/?rte_text>/i',               // Rich Text Editor tags (#1485647)
+      '/<title>.*<\/title>/i',          // PHP bug #32547 workaround: remove title tag
+      '/<html[^>]*>/im',                // malformed html: remove html tags (#1485139)
+      '/<\/html>/i',                    // malformed html: remove html tags (#1485139)
+      '/^[\xFE\xFF\xBB\xBF\x00]+((?:<\!doctype|\<html))/im',    // remove byte-order mark (only outlook?)
     );
     $html_replace = array(
@@ -654 +655 @@
       '',
       '',
+      '',
+      '',
       '\\1',
-      '',
     );
     $html = preg_replace($html_search, $html_replace, $html);