summaryrefslogtreecommitdiff
path: root/program/lib/html2text.php
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2012-09-27 08:27:02 +0200
committerAleksander Machniak <alec@alec.pl>2012-09-27 08:27:02 +0200
commit700dc66c679f0ae6e16c9d016a15bee4269371e6 (patch)
tree21f30c64e3f2559d015777ec7798855d32be24b5 /program/lib/html2text.php
parent18df6f38adb9fb067af104e4cf9484904bf49365 (diff)
parentdc8f292b215719506c2ab0abd8429f4c5ec5c0ed (diff)
Merge branch 'master' of github.com:roundcube/roundcubemail
Diffstat (limited to 'program/lib/html2text.php')
-rw-r--r--program/lib/html2text.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/program/lib/html2text.php b/program/lib/html2text.php
index 28c5ae059..dd413e0d6 100644
--- 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>