Merge pull request #187 from greezybacon/issue/drop-doctype

email: drop <!DOCTYPE ...> strings from email body Reviewed-By: Peter Rotich <peter@osticket.com>

Merge pull request #187 from greezybacon/issue/drop-doctype
7536e7f6 · Peter Rotich · 72a7c385 · 86b0bcde · 7536e7f6
Commit 7536e7f6 authored 11 years ago by Peter Rotich
--- a/include/class.format.php
+++ b/include/class.format.php
@@ -207,8 +207,10 @@ class Format {
        // Remove HEAD and STYLE sections
        $html = preg_replace(
            array(':<(head|style).+</\1>:is',   # <head> and <style> sections
-                  ':<!\[[^]<]+\]>:'),           # <![if !mso]> and friends
-            array('', ''),
+                  ':<!\[[^]<]+\]>:',            # <![if !mso]> and friends
+                  ':<!DOCTYPE[^>]+>:',          # <!DOCTYPE ... >
+            ),
+            array('', '', ''),
            $html);
        $config = array(
            'safe' => 1, //Exclude applet, embed, iframe, object and script tags.