aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIgor Wiedler <igor@wiedler.ch>2011-10-13 16:43:11 +0200
committerIgor Wiedler <igor@wiedler.ch>2011-10-13 16:43:11 +0200
commit3cd8c2507d4181a32484e47d6eef6601485bfb25 (patch)
treeaf420f6a983b0fd67d35da29e940d66a60c636ca
parent86f8851c403bb9f31b43a9656e844e5c925da19a (diff)
downloadforums-3cd8c2507d4181a32484e47d6eef6601485bfb25.tar
forums-3cd8c2507d4181a32484e47d6eef6601485bfb25.tar.gz
forums-3cd8c2507d4181a32484e47d6eef6601485bfb25.tar.bz2
forums-3cd8c2507d4181a32484e47d6eef6601485bfb25.tar.xz
forums-3cd8c2507d4181a32484e47d6eef6601485bfb25.zip
[ticket/10307] Return false in mysqli sql_fetchrow on empty result
PHPBB3-10307
-rw-r--r--phpBB/includes/db/mysqli.php8
1 files changed, 7 insertions, 1 deletions
diff --git a/phpBB/includes/db/mysqli.php b/phpBB/includes/db/mysqli.php
index 46c2f9210b..456ce906d0 100644
--- a/phpBB/includes/db/mysqli.php
+++ b/phpBB/includes/db/mysqli.php
@@ -249,7 +249,13 @@ class dbal_mysqli extends dbal
return $cache->sql_fetchrow($query_id);
}
- return ($query_id !== false) ? @mysqli_fetch_assoc($query_id) : false;
+ if ($query_id !== false)
+ {
+ $result = @mysqli_fetch_assoc($query_id);
+ return $result !== null ? $result : false;
+ }
+
+ return false;
}
/**