- performance fix: don't fetch attachment headers twice when parse filename...

alecpl

2009-02-04 6e047cff291d9948de70e2abb36abd3f74d65888

 program/lib/html2text.php

@@ -176,7 +176,6 @@
        '/&(bull|#149|#8226);/i',                // Bullet
        '/&(pound|#163);/i',                     // Pound sign
        '/&(euro|#8364);/i',                     // Euro sign
        '/&[^&;]+;/i',                           // Unknown/unhandled entities
        '/[ ]{2,}/'                              // Runs of spaces, post-handling
    );

@@ -220,7 +219,6 @@
        '*',
        '£',
        'EUR',                                  // Euro sign. € ?
        '',                                     // Unknown/unhandled entities
        ' '                                     // Runs of spaces, post-handling
    );

@@ -468,13 +466,16 @@
   // 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');

        // Remove unknown/unhandled entities (this cannot be done in search-and-replace block)
        $text = preg_replace('/&[^&;]+;/i', '', $text); 

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