From 0b371c8103b49a1bc9cde99fc13dabc330e9936c Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Tue, 30 Oct 2018 13:55:08 +0100 Subject: fix html2markdown() and re-enable previously failing tests --- include/markdown.php | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'include/markdown.php') diff --git a/include/markdown.php b/include/markdown.php index d2148811c..0947afeff 100644 --- a/include/markdown.php +++ b/include/markdown.php @@ -248,20 +248,12 @@ function bb_to_markdown($Text, $options = []) { // Convert it to HTML - don't try oembed $Text = bbcode($Text, [ 'tryoembed' => false ]); - // Markdownify does not preserve previously escaped html entities such as <> and &. - //$Text = str_replace(array('<','>','&'),array('&_lt_;','&_gt_;','&_amp_;'),$Text); - // Now convert HTML to Markdown - $Text = html2markdown($Text); //html2markdown adds backslashes infront of hashes after a new line. remove them $Text = str_replace("\n\#", "\n#", $Text); - // It also adds backslashes to our attempt at getting around the html entity preservation for some weird reason. - - //$Text = str_replace(array('&\\_lt\\_;','&\\_gt\\_;','&\\_amp\\_;'),array('<','>','&'),$Text); - // If the text going into bbcode() has a plain URL in it, i.e. // with no [url] tags around it, it will come out of parseString() // looking like: , which gets removed by strip_tags(). @@ -298,7 +290,8 @@ function html2markdown($html,$options = []) { $internal_errors = libxml_use_internal_errors(true); - $environment = Environment::createDefaultEnvironment($options); + $environment = new Environment($options); + $environment->createDefaultEnvironment(); $environment->addConverter(new TableConverter()); $converter = new HtmlConverter($environment); -- cgit v1.2.3