diff options
| author | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2008-04-15 18:34:52 +0000 |
|---|---|---|
| committer | alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c> | 2008-04-15 18:34:52 +0000 |
| commit | 9cab47ca061b662473cf68f24f1667b813e0ee43 (patch) | |
| tree | f59fc09664c016ab76cc50c745358c740b758719 | |
| parent | d93e50bd7f7fc815c6f61bd5adb6fd9f80dc1d32 (diff) | |
#1484391, #1484403
git-svn-id: https://svn.roundcube.net/trunk@1307 208e9e7b-5314-0410-a742-e7e81cd9613c
| -rw-r--r-- | roundcubemail/CHANGELOG | 4 | ||||
| -rw-r--r-- | roundcubemail/program/steps/mail/func.inc | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/roundcubemail/CHANGELOG b/roundcubemail/CHANGELOG index fdb7685f3..65648e4c0 100644 --- a/roundcubemail/CHANGELOG +++ b/roundcubemail/CHANGELOG @@ -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/roundcubemail/program/steps/mail/func.inc b/roundcubemail/program/steps/mail/func.inc index 205db2f91..b75b1150c 100644 --- a/roundcubemail/program/steps/mail/func.inc +++ b/roundcubemail/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', |