- Fix to-text converting of HTML entities inside b/strong/th/hX tags (#1486...

alecpl

2010-01-12 da1722a587edc378d94409a735883d600f7b3430

 program/lib/html2text.php

@@ -468,10 +468,12 @@

        // 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 @@
        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");