Changeset da1722a in github

Timestamp:

Jan 12, 2010 2:46:22 AM (3 years ago)

Author:

alecpl <alec@…>

Branches:

master, HEAD, courier-fix, dev-browser-capabilities, pdo, release-0.6, release-0.7, release-0.8

Children:

e363390b

Parents:

8780304

Message:

• Fix to-text converting of HTML entities inside b/strong/th/hX tags (#1486422)

Files:

• CHANGELOG (modified) (1 diff)
• program/lib/html2text.php (modified) (2 diffs)

CHANGELOG

@@ -2 +2 @@
 ===========================
 
+- Fix to-text converting of HTML entities inside b/strong/th/hX tags (#1486422)
 - Bug in spellchecker suggestions when server charset != UTF8 (#1486406)
 - Managesieve: Fix requires generation for multiple actions (#1486397)

program/lib/html2text.php

@@ -469 +469 @@
         // 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)
@@ -567 +569 @@
         case 'strong':
             return $this->_strtoupper($matches[2]);
-        case 'hr':
+        case 'th':
             return $this->_strtoupper("\t\t". $matches[2] ."\n");
         case 'h':