- Better HTML entities conversion in html2text (#1485519)

alecpl

2008-11-20 300fc65a461ce37999e3f0df991b24ed1b3c1bd3

 program/lib/html2text.php

@@ -232,7 +232,7 @@
        '--',
        '-',
        '*',
        '£',
        '£',
        'EUR',                                  // Euro sign. € ?
        '',                                     // Unknown/unhandled entities
        ' '                                     // Runs of spaces, post-handling
@@ -465,7 +465,10 @@

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

@@ -543,7 +546,7 @@
   while(preg_match('/<pre[^>]*>(.*)<\/pre>/ismU', $text, $matches))
   {
       $result = preg_replace($this->pre_search, $this->pre_replace, $matches[1]);
       $text = preg_replace('/<pre[^>]*>.*<\/pre>/ismU', '<div><br>' . $result . '<br></div>', $text);
       $text = preg_replace('/<pre[^>]*>.*<\/pre>/ismU', '<div><br>' . $result . '<br></div>', $text, 1);
   }
    }
}