#1485640: http://pear.php.net/bugs/bug.php?id=13032 #1485640: html2text: mo...

alecpl

2008-12-22 4e0419b9cb984249b823e9484a2d63eb74fd156c

#1485640: http://pear.php.net/bugs/bug.php?id=13032
#1485640: html2text: move html_entity_decode() after preg_replace()

 program/lib/Mail/mimePart.php

@@ -243,7 +243,6 @@
        $encoded =& $this->_encoded;

        if (count($this->_subparts)) {
            srand((double)microtime()*1000000);
            $boundary = '=_' . md5(rand() . microtime());
            $this->_headers['Content-Type'] .= ';' . MAIL_MIMEPART_CRLF . "\t" . 'boundary="' . $boundary . '"';


 program/lib/html2text.php

@@ -468,13 +468,13 @@
    // Convert <PRE>
        $this->_convert_pre($text);

    // Replace known html entities
    $text = html_entity_decode($text, ENT_COMPAT, 'UTF-8');

        // 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');

        // Strip any other HTML tags
        $text = strip_tags($text, $this->allowed_tags);