From 3348176abaed294640761e55fedf5491bf8cddfc Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Sat, 27 Dec 2008 14:45:49 -0500
Subject: [PATCH] #1485647: handle PRE_TEXT tags in html messages (+ small fixes)

---
 program/steps/mail/func.inc |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 9a92c19..b3d7cfc 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -642,19 +642,21 @@
     // special replacements (not properly handled by washtml class)
     $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(
       '\\1'.' &nbsp; '.'\\3',
       '',
       '',
       '',
-      '\\1',
       '',
+      '',
+      '\\1',
     );
     $html = preg_replace($html_search, $html_replace, $html);
 

--
Gitblit v1.9.1