[xoops-svn] SF.net SVN: xoops-svn:[11958] XoopsCore/branches/2.6.x/2.6.0_doctrine/ htdocs/class/database/mysqldatabase.php

[<rgr...@us...>]

Revision: 11958
          http://sourceforge.net/p/xoops/svn/11958
Author:   rgriffith
Date:     2013-08-21 02:45:45 +0000 (Wed, 21 Aug 2013)
Log Message:
-----------
Add just enough error checking to limp through install.

Needs more attention, but this makes it possible to work with this branch directly.

Modified Paths:
--------------
    XoopsCore/branches/2.6.x/2.6.0_doctrine/htdocs/class/database/mysqldatabase.php

Modified: XoopsCore/branches/2.6.x/2.6.0_doctrine/htdocs/class/database/mysqldatabase.php
===================================================================
--- XoopsCore/branches/2.6.x/2.6.0_doctrine/htdocs/class/database/mysqldatabase.php	2013-08-21 02:43:10 UTC (rev 11957)
+++ XoopsCore/branches/2.6.x/2.6.0_doctrine/htdocs/class/database/mysqldatabase.php	2013-08-21 02:45:45 UTC (rev 11958)
@@ -93,6 +93,10 @@
      */
     public function fetchRow($result)
     {
+        if(!is_object($result))
+        {
+            return null;
+        }
         return $result->fetch(\PDO::FETCH_NUM);
     }
 
@@ -104,6 +108,10 @@
      */
     public function fetchArray($result)
     {
+        if(!is_object($result))
+        {
+            return null;
+        }
         return $result->fetch(\PDO::FETCH_ASSOC);
     }
 
@@ -115,6 +123,10 @@
      */
     public function fetchBoth($result)
     {
+        if(!is_object($result))
+        {
+            return null;
+        }
         return $result->fetch(\PDO::FETCH_BOTH);
     }
 
@@ -126,6 +138,10 @@
      */
     public function fetchObject($result)
     {
+        if(!is_object($result))
+        {
+            return null;
+        }
         return $result->fetch(\PDO::FETCH_OBJ);
     }
 
@@ -242,7 +258,12 @@
         }
         $xoopsPreload = XoopsPreload::getInstance();
         $xoopsPreload->triggerEvent('core.database.query.start');
-        $result = $this->conn->query($sql);
+        try {
+            $result = $this->conn->query($sql);
+        }
+        catch (Exception $e) {
+            $result=false;
+        }
         $this->_lastResult = $result;
         $xoopsPreload->triggerEvent('core.database.query.end');