Merged all main trunk bugfixes up to release 2.0.5

[fa-stable.git] / reporting / includes / class.pdf.inc

diff --git a/reporting/includes/class.pdf.inc b/reporting/includes/class.pdf.inc
index fe6011e1b450f3ed57cb2aad7caa95ce83d8d8d3..856a7994ea49b1214d707fd41f69b08c6ed25c8b 100644 (file)
--- a/reporting/includes/class.pdf.inc
+++ b/reporting/includes/class.pdf.inc
@@ -58,8 +58,8 @@ class Cpdf extends TCPDF {
                        $l = array('a_meta_charset' => 'ISO-8859-1', 'a_meta_dir' => 'ltr', 'a_meta_language' => 'en_GB', 'w_page' => 'page');
                $enc = $l['a_meta_charset'];
                $uni = ($enc == 'UTF-8' || $enc == 'GB2312' ? true : false);
-               if ($enc == "GB2312")
-                       ini_set("memory_limit", "25M");
+               if ($uni)
+                       ini_set("memory_limit", "48M");
                $this->TCPDF('P', 'pt', $pageSize, $uni, $enc);
                $this->setLanguageArray($l);
                $this->setPrintHeader(false);