diff options
author | Patrick Webster <noxwizard@phpbb.com> | 2013-10-14 16:37:23 -0500 |
---|---|---|
committer | Patrick Webster <noxwizard@phpbb.com> | 2013-10-14 16:37:23 -0500 |
commit | 76ddf1ca4143f38f3bf8fc6aabdb3fa302d6ed40 (patch) | |
tree | 29deb20a2bf6c902aa3bbea73ea02cf87e4ef369 /phpBB/phpbb/db/driver/mysql.php | |
parent | 40932c26eaa7cddd0731b136a77c9bad704b69e0 (diff) | |
download | forums-76ddf1ca4143f38f3bf8fc6aabdb3fa302d6ed40.tar forums-76ddf1ca4143f38f3bf8fc6aabdb3fa302d6ed40.tar.gz forums-76ddf1ca4143f38f3bf8fc6aabdb3fa302d6ed40.tar.bz2 forums-76ddf1ca4143f38f3bf8fc6aabdb3fa302d6ed40.tar.xz forums-76ddf1ca4143f38f3bf8fc6aabdb3fa302d6ed40.zip |
[ticket/11918] Make sql_freeresult() consistent across all DB drivers
PHPBB3-11918
Diffstat (limited to 'phpBB/phpbb/db/driver/mysql.php')
-rw-r--r-- | phpBB/phpbb/db/driver/mysql.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/db/driver/mysql.php b/phpBB/phpbb/db/driver/mysql.php index c76126763d..d215453ccb 100644 --- a/phpBB/phpbb/db/driver/mysql.php +++ b/phpBB/phpbb/db/driver/mysql.php @@ -289,7 +289,7 @@ class mysql extends \phpbb\db\driver\mysql_base $query_id = $this->query_result; } - if ($cache && $cache->sql_exists($query_id)) + if ($cache && !is_object($query_id) && $cache->sql_exists($query_id)) { return $cache->sql_freeresult($query_id); } |