summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfourat.zouari <fourat.zouari@208e9e7b-5314-0410-a742-e7e81cd9613c>2007-03-23 18:50:32 +0000
committerfourat.zouari <fourat.zouari@208e9e7b-5314-0410-a742-e7e81cd9613c>2007-03-23 18:50:32 +0000
commit15f812fdc97ba65de506202262fd1749938bc8c6 (patch)
tree3f92d3e71646265b0a12f39ea3fb121abd9f6bd2
parent82866407277315c4192b089c59d0a484d7fce1a3 (diff)
close #1484280
Refixed git-svn-id: https://svn.roundcube.net/trunk@518 208e9e7b-5314-0410-a742-e7e81cd9613c
-rwxr-xr-xroundcubemail/program/include/rcube_db.inc4
1 files changed, 3 insertions, 1 deletions
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);
}