From da1722a587edc378d94409a735883d600f7b3430 Mon Sep 17 00:00:00 2001 From: alecpl Date: Tue, 12 Jan 2010 07:46:22 +0000 Subject: - Fix to-text converting of HTML entities inside b/strong/th/hX tags (#1486422) --- program/lib/html2text.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'program/lib/html2text.php') diff --git a/program/lib/html2text.php b/program/lib/html2text.php index dbf0943d5..49c636f3c 100644 --- a/program/lib/html2text.php +++ b/program/lib/html2text.php @@ -468,11 +468,13 @@ class html2text // Run our defined search-and-replace $text = preg_replace($this->search, $this->replace, $text); - $text = preg_replace_callback($this->callback_search, array('html2text', '_preg_callback'), $text); // Replace known html entities $text = html_entity_decode($text, ENT_COMPAT, 'UTF-8'); + // Run our defined search-and-replace with callback + $text = preg_replace_callback($this->callback_search, array('html2text', '_preg_callback'), $text); + // Remove unknown/unhandled entities (this cannot be done in search-and-replace block) $text = preg_replace('/&[^&;]+;/i', '', $text); @@ -566,7 +568,7 @@ class html2text case 'b': case 'strong': return $this->_strtoupper($matches[2]); - case 'hr': + case 'th': return $this->_strtoupper("\t\t". $matches[2] ."\n"); case 'h': return $this->_strtoupper("\n\n". $matches[2] ."\n\n"); -- cgit v1.2.3