From: Joe Hunt <joe.hunt.consulting@gmail.com>
Date: Mon, 7 Jun 2010 07:18:10 +0000 (+0000)
Subject: HTML decode text when printing to Excel.
X-Git-Tag: 2.3-final~886
X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=commitdiff_plain;h=3468ef775ff6ad8d48e0d9f32a9ff71f92598c54;p=fa-stable.git

HTML decode text when printing to Excel.
---

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index e68c9387..6d2b5890 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -19,6 +19,10 @@ Legend:
 ! -> Note
 $ -> Affected files
 
+07-Jun-2010 Joe Hunt
+# HTML decode text when printing to Excel.
+$ /reporting/includes/excel_report.inc
+
 06-Jun-2010 Janusz Dobrowolski
 # False overallocation fixed.
 $ /includes/ui/allocation_cart.inc
diff --git a/reporting/includes/excel_report.inc b/reporting/includes/excel_report.inc
index 4f8dbc6a..c95c1b2c 100644
--- a/reporting/includes/excel_report.inc
+++ b/reporting/includes/excel_report.inc
@@ -522,6 +522,7 @@ class FrontReport extends Spreadsheet_Excel_Writer_Workbook
 
 	function TextCol($c, $n, $txt, $corr=0, $r=0, $border=0, $fill=0, $link=NULL, $stretch=0)
 	{
+		$txt = htmlspecialchars_decode($txt);	
 		if ($this->aligns[$c] == 'right')
 			$this->sheet->writeString($this->y, $c, $txt, $this->formatRight);
 		else	
@@ -555,6 +556,7 @@ class FrontReport extends Spreadsheet_Excel_Writer_Workbook
 
 	function TextCol2($c, $n, $txt, $corr=0, $r=0, $border=0, $fill=0, $link=NULL, $stretch=0)
 	{
+		$txt = htmlspecialchars_decode($txt);	
 		$this->sheet->writeString($this->y, $c, $txt, $this->formatLeft);
 		if ($n - $c > 1)
 			$this->sheet->mergeCells($this->y, $c, $this->y, $n - 1);