summaryrefslogtreecommitdiff
path: root/program/steps/mail
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2008-12-27 19:45:49 +0000
committeralecpl <alec@alec.pl>2008-12-27 19:45:49 +0000
commit3348176abaed294640761e55fedf5491bf8cddfc (patch)
treec5c0f4072ebe2065bb16eed966eb3fbff45af678 /program/steps/mail
parent922c2d923ab08e45846321d2ed69facc7db5af9c (diff)
#1485647: handle PRE_TEXT tags in html messages (+ small fixes)
Diffstat (limited to 'program/steps/mail')
-rw-r--r--program/steps/mail/func.inc14
1 files changed, 8 insertions, 6 deletions
diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc
index 9a92c19b7..b3d7cfc85 100644
--- a/program/steps/mail/func.inc
+++ b/program/steps/mail/func.inc
@@ -642,19 +642,21 @@ function rcmail_print_body($part, $p = array())
// 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);