From 3e3f6245495ae5261887fd85081fc6e1a1f7b0d4 Mon Sep 17 00:00:00 2001 From: Cameron Ball Date: Mon, 21 Mar 2016 10:49:00 +0800 Subject: [PATCH] MDL-53393 libraries: Upgrade Html2Text to 4.0.1 --- lib/html2text/Html2Text.php | 109 +++++++++++------- .../fixtures/messageinbound/evolution.test | 2 +- .../fixtures/messageinbound/outlook.test | 2 +- lib/tests/html2text_test.php | 4 +- lib/tests/weblib_test.php | 4 +- lib/thirdpartylibs.xml | 2 +- mod/quiz/tests/locallib_test.php | 2 +- .../type/essay/tests/upgradelibnewqe_test.php | 2 +- 8 files changed, 76 insertions(+), 51 deletions(-) diff --git a/lib/html2text/Html2Text.php b/lib/html2text/Html2Text.php index 0654e2cb21c..0ed5e404d66 100644 --- a/lib/html2text/Html2Text.php +++ b/lib/html2text/Html2Text.php @@ -23,6 +23,8 @@ class Html2Text { const ENCODING = 'UTF-8'; + protected $htmlFuncFlags; + /** * Contains the HTML content to convert. * @@ -47,27 +49,25 @@ class Html2Text protected $search = array( "/\r/", // Non-legal carriage return "/[\n\t]+/", // Newlines and tabs - '/]*>.*?<\/head>/i', // - '/]*>.*?<\/script>/i', //