X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=reporting%2Fincludes%2Fclass.pdf.inc;h=ab76ab46ed20fb3311ef59e971682608a97b64ae;hb=19ddc3939071044c8e94b628f1d6a039f50cc493;hp=9bc222d3eaa82ef13e0d5f65e58d0bdc9458af39;hpb=264c09696d65efe4532c197f317162daf8c24f32;p=fa-stable.git

diff --git a/reporting/includes/class.pdf.inc b/reporting/includes/class.pdf.inc
index 9bc222d3..ab76ab46 100644
--- a/reporting/includes/class.pdf.inc
+++ b/reporting/includes/class.pdf.inc
@@ -63,9 +63,9 @@ include_once (dirname(__FILE__).'/fpdi/fpdi.php');
 
 class Cpdf extends FPDI {
 
-	function Cpdf($pageSize='A4', $lang=null, $pageOrientation='P')
+	function __construct($pageSize='A4', $lang=null, $pageOrientation='P')
 	{
-		$this->TCPDF($pageOrientation, 'pt', $pageSize);//, $uni, $enc);
+		parent::__construct($pageOrientation, 'pt', $pageSize);//, $uni, $enc);
 		$this->SetLang($lang);
 		$this->setPrintHeader(false);
 		$this->setPrintFooter(false);
@@ -120,7 +120,6 @@ class Cpdf extends FPDI {
 		$this->FontFamily = 'helvetica';
 		$this->FontStyle = '';
 		$this->FontSizePt = 12;
-//		$this->utf8Bidi(array(""));
 	}
 
 
@@ -309,6 +308,7 @@ class Cpdf extends FPDI {
 		else
 			$align = 'R';
 
+		$txt = parent::unhtmlentities($txt);
 		// If horizontal scaling was requested, check to see if we're trying to scale
 		// too much.  If so, cut back string first and then scale it.
 		$maxScaleFactor = 1.4;
@@ -320,7 +320,7 @@ class Cpdf extends FPDI {
 		$ret = $txt[1];
 		$txt = $txt[0];
 		$this->SetXY($xb, $this->h - $yb - $h);
-		$txt = parent::unhtmlentities($txt);
+
 		if ($this->isunicode && $this->encoding != "UTF-8")
 			$txt = iconv($this->encoding, "UTF-8", $txt);
 		$this->Cell($w, $h, $txt, $border, 0, $align, $fill, $link, $stretch);
@@ -334,4 +334,3 @@ class Cpdf extends FPDI {
 
 } // end of class
 
-?>
\ No newline at end of file