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/mssql.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/mssql.php')
| -rw-r--r-- | phpBB/phpbb/db/driver/mssql.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/phpbb/db/driver/mssql.php b/phpBB/phpbb/db/driver/mssql.php index 4d2cd287da..50096deded 100644 --- a/phpBB/phpbb/db/driver/mssql.php +++ b/phpBB/phpbb/db/driver/mssql.php @@ -318,14 +318,14 @@ class mssql extends \phpbb\db\driver\driver $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); } - if (isset($this->open_queries[$query_id])) + if (isset($this->open_queries[(int) $query_id])) { - unset($this->open_queries[$query_id]); + unset($this->open_queries[(int) $query_id]); return @mssql_free_result($query_id); } |