summaryrefslogtreecommitdiff
path: root/program
diff options
context:
space:
mode:
authorThomas Bruederli <thomas@roundcube.net>2012-09-26 20:41:50 +0200
committerThomas Bruederli <thomas@roundcube.net>2012-09-26 20:41:50 +0200
commitb64233339b36e6781d2097f8318b7dca4b8aed32 (patch)
tree09ec3116c55a9eb2dab1a34253732bdd1aa60d32 /program
parent0746d58fcebf1f259d5e4cac72833ea41b86410a (diff)
parentdc8f292b215719506c2ab0abd8429f4c5ec5c0ed (diff)
Merge branch 'master' of github.com:roundcube/roundcubemail
Diffstat (limited to 'program')
-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>