From b64233339b36e6781d2097f8318b7dca4b8aed32 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Wed, 26 Sep 2012 14:41:50 -0400
Subject: [PATCH] Merge branch 'master' of github.com:roundcube/roundcubemail
---
program/lib/html2text.php | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/program/lib/html2text.php b/program/lib/html2text.php
index 28c5ae0..dd413e0 100644
--- a/program/lib/html2text.php
+++ b/program/lib/html2text.php
@@ -145,6 +145,7 @@
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 @@
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>
--
Gitblit v1.9.1