[0004594] Suppliers: inactive tax groups should not appear in tax group selector...

[fa-stable.git] / reporting / includes / tcpdf.php

diff --git a/reporting/includes/tcpdf.php b/reporting/includes/tcpdf.php
index 0f6f48d73c78c198a8be329e21bd50960e835039..c2140575276e9d5b8ad773b34c182a413650c199 100644 (file)
--- a/reporting/includes/tcpdf.php
+++ b/reporting/includes/tcpdf.php
@@ -1112,7 +1112,7 @@ if (!class_exists('TCPDF')) {
                 * @param boolean $unicode TRUE means that the input text is unicode (default = true)
                 * @param String $encoding charset encoding; default is UTF-8
                 */
-               function TCPDF($orientation='P', $unit='mm', $format='A4', $uni=true, $encoding="UTF-8") {
+               function __construct($orientation='P', $unit='mm', $format='A4', $uni=true, $encoding="UTF-8") {
                        if ($uni) // Fix for FrontAccounting
                        {
                                global $unicode, $unicode_mirror, $unicode_arlet, $laa_array, $diacritics;
@@ -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 ----------------------------------
@@ -10430,4 +10427,3 @@ if (!class_exists('TCPDF')) {
 //============================================================+
 // END OF FILE
 //============================================================+
-?>