From 15f812fdc97ba65de506202262fd1749938bc8c6 Mon Sep 17 00:00:00 2001
From: "fourat.zouari" <fourat.zouari@208e9e7b-5314-0410-a742-e7e81cd9613c>
Date: Fri, 23 Mar 2007 18:50:32 +0000
Subject: close #1484280 Refixed

git-svn-id: https://svn.roundcube.net/trunk@518 208e9e7b-5314-0410-a742-e7e81cd9613c
---
 roundcubemail/program/include/rcube_db.inc | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'roundcubemail/program/include')

diff --git a/roundcubemail/program/include/rcube_db.inc b/roundcubemail/program/include/rcube_db.inc
index 0eb191a8a..6f362a31d 100755
--- a/roundcubemail/program/include/rcube_db.inc
+++ b/roundcubemail/program/include/rcube_db.inc
@@ -360,12 +360,14 @@ class rcube_db
    */
   function _fetch_row($result, $mode)
     {
-    if (!$result || !is_object($result) || DB::isError($result))
+    if (!$result || DB::isError($result))
       {
       raise_error(array('code' => 500, 'type' => 'db', 'line' => __LINE__, 'file' => __FILE__,
                         'message' => $this->db_link->getMessage()), TRUE, FALSE);
       return FALSE;
       }
+      elseif (!is_object($result))
+      return FALSE;
                          
     return $result->fetchRow($mode);
     }
-- 
cgit v1.2.3