diff options
| author | alecpl <alec@alec.pl> | 2008-04-15 18:34:52 +0000 |
|---|---|---|
| committer | alecpl <alec@alec.pl> | 2008-04-15 18:34:52 +0000 |
| commit | d7a411f099596cbc8e749e1f0802ac2bb2c6289e (patch) | |
| tree | a645e8074874b7140bce51b1bba1aa170deca725 | |
| parent | 76a89bf04d7c3dd6b6261ca55a24fd57a30d50cb (diff) | |
#1484391, #1484403
| -rw-r--r-- | CHANGELOG | 4 | ||||
| -rw-r--r-- | program/steps/mail/func.inc | 3 |
2 files changed, 5 insertions, 2 deletions
@@ -6,7 +6,9 @@ CHANGELOG RoundCube Webmail - Fix remove signature when replying (#1333167) - Fix problem with line with a space at the end (#1484916) - Don't send set_env() in ajax response when env array is empty - +- Fix <!DOCTYPE> tag filtering (#1484391) +- Fix <?xml> tag filtering (#1484403) + 2008/04/14 (alec) ---------- - Added sections (fieldset+label) in Settings interface diff --git a/program/steps/mail/func.inc b/program/steps/mail/func.inc index 205db2f91..b75b1150c 100644 --- a/program/steps/mail/func.inc +++ b/program/steps/mail/func.inc @@ -1139,7 +1139,8 @@ function rcmail_sanitize_html($body, $container_id) // add comments arround html and other tags $out = preg_replace(array( - '/(<!DOCTYPE.+)/i', + '/(<!DOCTYPE[^>]*>)/i', + '/(<\?xml[^>]*>)/i', '/(<\/?html[^>]*>)/i', '/(<\/?head[^>]*>)/i', '/(<title[^>]*>.*<\/title>)/Ui', |