- Better HTML entities conversion in html2text (#1485519)

git-svn-id: https://svn.roundcube.net/trunk@2070 208e9e7b-5314-0410-a742-e7e81cd9613c

1 files changed, 5 insertions, 2 deletions

diff --git a/roundcubemail/program/lib/html2text.php b/roundcubemail/program/lib/html2text.php
index 4180cac28..938dfecfe 100644
--- a/roundcubemail/program/lib/html2text.php
+++ b/roundcubemail/program/lib/html2text.php
@@ -232,7 +232,7 @@ class html2text
         '--',
         '-',
         '*',
-        '£',
+        '£',
         'EUR',                                  // Euro sign. € ?
         '',                                     // Unknown/unhandled entities
         ' '                                     // Runs of spaces, post-handling
@@ -465,7 +465,10 @@ class html2text
 
 	// 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);