Bug 4504. utf-8 decoding not working for some special characters on pdf reports....

diff --git a/reporting/includes/tcpdf.php b/reporting/includes/tcpdf.php
index 139dea600bfc788c01f7d14f9fa65c7aec02a739..c2140575276e9d5b8ad773b34c182a413650c199 100644 (file)
--- a/reporting/includes/tcpdf.php
+++ b/reporting/includes/tcpdf.php
@@ -5731,10 +5731,7 @@ if (!class_exists('TCPDF')) {
                 * @return string converted
                 */
                function unhtmlentities($text_to_convert) {
-                       if (!$this->isunicode) {
-                               return html_entity_decode($text_to_convert, ENT_QUOTES);
-                       }
-                       return html_entity_decode_php4($text_to_convert);
+                       return html_entity_decode($text_to_convert, ENT_QUOTES, $this->encoding);
                }
 
                // ENCRYPTION METHODS ----------------------------------