Fixed broken html enities handling in longer TextWrap fields in reports.

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

diff --git a/reporting/includes/class.pdf.inc b/reporting/includes/class.pdf.inc
index 300cd40194987856fee4080535f9f81ba44f86ff..172c328a9896c547e712239b9bccaa93efe297d7 100644 (file)
--- a/reporting/includes/class.pdf.inc
+++ b/reporting/includes/class.pdf.inc
@@ -120,7 +120,6 @@ class Cpdf extends FPDI {
                $this->FontFamily = 'helvetica';
                $this->FontStyle = '';
                $this->FontSizePt = 12;
-//             $this->utf8Bidi(array(""));
        }
 
 
@@ -181,7 +180,7 @@ class Cpdf extends FPDI {
                 {
                     default :        $fontname = "freesans13";     break;
                 }
-            }                  
+            }
             // else use built-in adobe fonts helvetica.
                }
                $this->SetFont($fontname, $style);
@@ -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