Merge branch 'master' of github.com:roundcube/roundcubemail

12 years ago · b64233339b
parent 0746d58fce dc8f292b21
commit b64233339b
1 changed files with 2 additions and 0 deletions
--- a/program/lib/html2text.php
+++ b/program/lib/html2text.php
@ -145,6 +145,7 @@ class html2text
    var $search = array(
        "/\r/",                                  // Non-legal carriage return
        "/[\n\t]+/",                             // Newlines and tabs
+        '/<head[^>]*>.*?<\/head>/i',             // <head>
        '/<script[^>]*>.*?<\/script>/i',         // <script>s -- which strip_tags supposedly has problems with
        '/<style[^>]*>.*?<\/style>/i',           // <style>s -- which strip_tags supposedly has problems with
        '/<p[^>]*>/i',                           // <P>
@ -172,6 +173,7 @@ class html2text
    var $replace = array(
        '',                                     // Non-legal carriage return
        ' ',                                    // Newlines and tabs
+        '',                                     // <head>
        '',                                     // <script>s -- which strip_tags supposedly has problems with
        '',                                     // <style>s -- which strip_tags supposedly has problems with
        "\n\n",                                 // <P>