summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoralecpl <alec@alec.pl>2010-01-12 07:46:22 +0000
committeralecpl <alec@alec.pl>2010-01-12 07:46:22 +0000
commitda1722a587edc378d94409a735883d600f7b3430 (patch)
tree98c8827a40d5df0403f3fa1436dc3a57bd9d9078
parent8780304bc834df704adf710200e6741d095616fd (diff)
- Fix to-text converting of HTML entities inside b/strong/th/hX tags (#1486422)
-rw-r--r--CHANGELOG1
-rw-r--r--program/lib/html2text.php6
2 files changed, 5 insertions, 2 deletions
diff --git a/CHANGELOG b/CHANGELOG
index 12a5d31aa..7a44f89dd 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,6 +1,7 @@
CHANGELOG RoundCube Webmail
===========================
+- 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)
- Fix LDAP problem with special characters in RDN (#1486320)
diff --git a/program/lib/html2text.php b/program/lib/html2text.php
index dbf0943d5..49c636f3c 100644
--- a/program/lib/html2text.php
+++ b/program/lib/html2text.php
@@ -468,11 +468,13 @@ class html2text
// 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)
$text = preg_replace('/&[^&;]+;/i', '', $text);
@@ -566,7 +568,7 @@ class html2text
case 'b':
case 'strong':
return $this->_strtoupper($matches[2]);
- case 'hr':
+ case 'th':
return $this->_strtoupper("\t\t". $matches[2] ."\n");
case 'h':
return $this->_strtoupper("\n\n". $matches[2] ."\n\n");