Permalink
Browse files

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

  • Loading branch information...
thomascube committed Sep 26, 2012
2 parents 0746d58 + dc8f292 commit b64233339b36e6781d2097f8318b7dca4b8aed32
Showing with 2 additions and 0 deletions.
  1. +2 −0 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>

0 comments on commit b642333

Please sign in to comment.