aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTristan Darricau <github@nicofuma.fr>2014-06-22 23:13:10 +0200
committerTristan Darricau <github@nicofuma.fr>2014-06-22 23:36:57 +0200
commitbc3659a1861597b8edd5b9b3789260b93ac3f121 (patch)
tree9066a86d7ea9fbbbc34eaa3c53e309e9418e21b8
parentd039f56af00fb98b2b03f54f00ce4bb1436e9932 (diff)
downloadforums-bc3659a1861597b8edd5b9b3789260b93ac3f121.tar
forums-bc3659a1861597b8edd5b9b3789260b93ac3f121.tar.gz
forums-bc3659a1861597b8edd5b9b3789260b93ac3f121.tar.bz2
forums-bc3659a1861597b8edd5b9b3789260b93ac3f121.tar.xz
forums-bc3659a1861597b8edd5b9b3789260b93ac3f121.zip
[ticket/12387] Fix \phpbb\db\driver\mysqli::sql_freeresult
PHPBB3-12387
-rw-r--r--phpBB/phpbb/db/driver/mysqli.php7
1 files changed, 6 insertions, 1 deletions
diff --git a/phpBB/phpbb/db/driver/mysqli.php b/phpBB/phpbb/db/driver/mysqli.php
index 410d84c1df..4c6963673e 100644
--- a/phpBB/phpbb/db/driver/mysqli.php
+++ b/phpBB/phpbb/db/driver/mysqli.php
@@ -293,11 +293,16 @@ class mysqli extends \phpbb\db\driver\mysql_base
return $cache->sql_freeresult($query_id);
}
- if (!$this->query_result)
+ if (!$query_id)
{
return false;
}
+ if ($query_id === true)
+ {
+ return true;
+ }
+
return mysqli_free_result($query_id);
}