Rerun
authorJoe Hunt <joe.hunt.consulting@gmail.com>
Mon, 7 Jun 2010 15:07:21 +0000 (15:07 +0000)
committerJoe Hunt <joe.hunt.consulting@gmail.com>
Mon, 7 Jun 2010 15:07:21 +0000 (15:07 +0000)
reporting/includes/excel_report.inc

index c95c1b2ccb5a85f780c3e4053e477d6b4b0310bc..c24c09a5d30c1bac1ff3b91896d21167f9fa3984 100644 (file)
@@ -522,7 +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);   
+               $txt = html_entity_decode($txt);        
                if ($this->aligns[$c] == 'right')
                        $this->sheet->writeString($this->y, $c, $txt, $this->formatRight);
                else    
@@ -556,7 +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);   
+               $txt = html_entity_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);