count error when printing to Excel. Fixed.

diff --git a/reporting/includes/Workbook.php b/reporting/includes/Workbook.php
index 7e64a1b3a1320beb6358fe9fa8f0c2b10ddb52b4..04785f052bfdf1a447bf5209ffcec27587e7f1e0 100644 (file)
--- a/reporting/includes/Workbook.php
+++ b/reporting/includes/Workbook.php
@@ -6653,7 +6653,7 @@ class Spreadsheet_Excel_Writer_Worksheet extends Spreadsheet_Excel_Writer_BIFFwr
         $colcount = count($this->_colinfo);
         for ($i = 0; $i < $colcount; $i++) {
            // Skip cols without outline level info.
-           if (count($col_level) >= 6) {
+           if (count_array($col_level) >= 6) {
               $col_level = max($this->_colinfo[$i][5], $col_level);
            }
         }

diff --git a/reporting/includes/excel_report.inc b/reporting/includes/excel_report.inc
index 483d0fde157170d2d66fd99dc390d856908f6a83..1ee91c703076d348a48c0b99ba502bb0fbd45898 100644 (file)
--- a/reporting/includes/excel_report.inc
+++ b/reporting/includes/excel_report.inc
@@ -240,7 +240,7 @@ class FrontReport extends Spreadsheet_Excel_Writer_Workbook
                $this->headers2 = $headers2;
                $this->aligns2 = $aligns2;
                $this->numcols = count($this->headers);
-               $tcols = count($this->headers2);
+               $tcols = count_array($this->headers2);
                if ($tcols > $this->numcols)
                        $this->numcols = $tcols;
                for ($i = 0; $i < $this->numcols; $i++)

diff --git a/reporting/includes/pdf_report.inc b/reporting/includes/pdf_report.inc
index 29f6a5bbd733e41ba2a47f831efe9763e821f36f..a0a78be95b0784c49531c477a4603374c4164fb9 100644 (file)
--- a/reporting/includes/pdf_report.inc
+++ b/reporting/includes/pdf_report.inc
@@ -371,7 +371,7 @@ class FrontReport extends Cpdf
                $this->Font('italic');
                if ($this->headers2 != null)
                {
-                       $count = count($this->headers2);
+                       $count = count_array($this->headers2);
                        for ($i = 0; $i < $count; $i++)
                                $this->TextCol2($i, $i + 1,     $this->headers2[$i]);
                        $this->NewLine();