From 06895c3e947e1b15da3bb2f6f425962949edb9d9 Mon Sep 17 00:00:00 2001 From: thomascube <thomas@roundcube.net> Date: Fri, 18 May 2007 08:35:28 -0400 Subject: [PATCH] Better refresh of message list; improved HTML mail display --- program/steps/mail/func.inc | 20 +++++++++++--------- 1 files changed, 11 insertions(+), 9 deletions(-) diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index fc17417..cc1187b 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -1207,16 +1207,18 @@ $body = preg_replace('/<a\s+([^>]+)>/Uie', "rcmail_alter_html_link('\\1');", $body); // add comments arround html and other tags - $out = preg_replace(array('/(<\/?html[^>]*>)/i', - '/(<\/?head[^>]*>)/i', - '/(<title[^>]*>.*<\/title>)/Ui', - '/(<\/?meta[^>]*>)/i'), - '<!--\\1-->', - $body); + $out = preg_replace(array( + '/(<!DOCTYPE.+)/i', + '/(<\/?html[^>]*>)/i', + '/(<\/?head[^>]*>)/i', + '/(<title[^>]*>.*<\/title>)/Ui', + '/(<\/?meta[^>]*>)/i'), + '<!--\\1-->', + $body); - $out = preg_replace(array('/(<body[^>]*>)/i', - '/(<\/body>)/i'), - array('<div class="rcmBody">', + $out = preg_replace(array('/<body([^>]*)>/i', + '/<\/body>/i'), + array('<div class="rcmBody"\\1>', '</div>'), $out); -- Gitblit v1.9.1