From: stronk7 <stronk7>
Date: Tue, 11 Apr 2006 22:49:09 +0000 (+0000)
Subject: Solve some notices that were breaking Excel generation under
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=766ad628082709b241fa6ef57891f0592279e3c5;p=moodle.git

Solve some notices that were breaking Excel generation under
some PHP versions. As bug is well documented but PEAR code hasn't
been changed in origin, we'll patch it here. Changes will
merge smoothly in the future, I think.
(Moode Bug: http://moodle.org/bugs/bug.php?op=show&bugid=4763)
(PEAR Bug: http://pear.php.net/bugs/bug.php?id=6509)
---

diff --git a/lib/excellib.class.php b/lib/excellib.class.php
index 13817b5d8d..1cb92495ee 100644
--- a/lib/excellib.class.php
+++ b/lib/excellib.class.php
@@ -219,7 +219,7 @@ class MoodleExcelWorksheet {
      * @return mixed PEAR Excel Format object
      */
     function MoodleExcelFormat2PearExcelFormat($format) {
-        if ($format != 0) {
+        if (is_object($format)) {
             return $format->pear_excel_format;
         } else {
             return 0;
diff --git a/lib/pear/Spreadsheet/Excel/Writer/Worksheet.php b/lib/pear/Spreadsheet/Excel/Writer/Worksheet.php
index f868e2f036..5d843dc31d 100644
--- a/lib/pear/Spreadsheet/Excel/Writer/Worksheet.php
+++ b/lib/pear/Spreadsheet/Excel/Writer/Worksheet.php
@@ -1230,7 +1230,7 @@ class Spreadsheet_Excel_Writer_Worksheet extends Spreadsheet_Excel_Writer_BIFFwr
     */
     function _XF(&$format)
     {
-        if ($format != 0) {
+        if (is_object($format)) {
             return($format->getXfIndex());
         } else {
             return(0x0F);
@@ -1683,7 +1683,7 @@ class Spreadsheet_Excel_Writer_Worksheet extends Spreadsheet_Excel_Writer_BIFFwr
     function writeBlank($row, $col, $format)
     {
         // Don't write a blank cell unless it has a format
-        if ($format == 0) {
+        if (!is_object($format)) {
             return(0);
         }
 
@@ -1870,7 +1870,7 @@ class Spreadsheet_Excel_Writer_Worksheet extends Spreadsheet_Excel_Writer_BIFFwr
         $record      = 0x01B8;                       // Record identifier
         $length      = 0x00000;                      // Bytes to follow
 
-        if ($format == 0) {
+        if (!is_object($format)) {
             $format = $this->_url_format;
         }
 
@@ -1930,7 +1930,7 @@ class Spreadsheet_Excel_Writer_Worksheet extends Spreadsheet_Excel_Writer_BIFFwr
         $record      = 0x01B8;                       // Record identifier
         $length      = 0x00000;                      // Bytes to follow
 
-        if ($format == 0) {
+        if (!is_object($format)) {
             $format = $this->_url_format;
         }
 
@@ -2002,7 +2002,7 @@ class Spreadsheet_Excel_Writer_Worksheet extends Spreadsheet_Excel_Writer_BIFFwr
         $record      = 0x01B8;                       // Record identifier
         $length      = 0x00000;                      // Bytes to follow
     
-        if ($format == 0) {
+        if (!is_object($format)) {
             $format = $this->_url_format;
         }
     
@@ -2158,7 +2158,7 @@ class Spreadsheet_Excel_Writer_Worksheet extends Spreadsheet_Excel_Writer_BIFFwr
             $grbit |= 0x0020;
         }
         $grbit |= 0x0040; // fUnsynced
-        if ($format) {
+        if (is_object($format)) {
             $grbit |= 0x0080;
         }
         $grbit |= 0x0100;