Merging version 2.1 RC to main trunk.

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

diff --git a/reporting/includes/tcpdf.php b/reporting/includes/tcpdf.php
index 35e69ddae362025a9eb374c063b3f493d68474c9..48504eb945a7db15c5e70b8cb009410b583e87ee 100644 (file)
--- a/reporting/includes/tcpdf.php
+++ b/reporting/includes/tcpdf.php
@@ -1756,7 +1756,8 @@ if (!class_exists('TCPDF')) {
                */
                function Error($msg) {
                        //Fatal error
-                       die('<strong>TCPDF error: </strong>'.$msg);
+                       display_error('<strong>TCPDF error: </strong>'.$msg);
+                       exit;
                }
 
                /**
@@ -2602,9 +2603,9 @@ if (!class_exists('TCPDF')) {
                        if (isset($cw)) {
                                unset($cw);
                        }
-                       include($this->_getfontpath().$file);
+                       @include($this->_getfontpath().$file);
                        if ((!isset($type)) OR (!isset($cw))) {
-                               $this->Error('Could not include font definition file');
+                               $this->Error("Could not include font definition file: ".$file);
                        }
                        $i = count($this->fonts) + 1;
                        // register CID font (all styles at once)
@@ -5005,7 +5006,8 @@ if (!class_exists('TCPDF')) {
                * @access protected
                */
                function _putheader() {
-                       $this->_out('%PDF-'.$this->PDFVersion);
+                       $this->buffer = '%PDF-'.$this->PDFVersion."\n".$this->buffer;
+//                     $this->_out('%PDF-'.$this->PDFVersion);
                }
 
                /**