Changeset 2186 in subversion

Timestamp:

Dec 22, 2008 1:27:25 PM (4 years ago)

Author:

alec

Message:

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

Location:

trunk/roundcubemail/program/lib

Files:

• Mail/mimePart.php (modified) (1 diff)
• html2text.php (modified) (1 diff)

trunk/roundcubemail/program/lib/Mail/mimePart.php

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

trunk/roundcubemail/program/lib/html2text.php

@@ -469 +469 @@
         $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