aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/db/driver/mssqlnative.php
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2013-10-15 18:40:43 +0200
committerJoas Schilling <nickvergessen@gmx.de>2013-10-15 18:40:43 +0200
commit3521dfc2787a532365dba12eec669579d15d79f2 (patch)
tree9e606800cdde4e3051ed8eae0685afdc4b8c1929 /phpBB/phpbb/db/driver/mssqlnative.php
parent40932c26eaa7cddd0731b136a77c9bad704b69e0 (diff)
parenta35721f68c95153f46dd67ea465addedf82f538e (diff)
downloadforums-3521dfc2787a532365dba12eec669579d15d79f2.tar
forums-3521dfc2787a532365dba12eec669579d15d79f2.tar.gz
forums-3521dfc2787a532365dba12eec669579d15d79f2.tar.bz2
forums-3521dfc2787a532365dba12eec669579d15d79f2.tar.xz
forums-3521dfc2787a532365dba12eec669579d15d79f2.zip
Merge remote-tracking branch 'p/prep-release-3.1.0-a1' into develop
* p/prep-release-3.1.0-a1: [prep-release-3.1.0-a1] Update changelog with the latest changes [ticket/11919] Remove extra argument to notification manager's sql_fetchfield() [ticket/11918] Make sql_freeresult() consistent across all DB drivers [prep-release-3.1.0-a1] Only build packages for the latest olympus versions [prep-release-3.1.0-a1] Update changelog with 3.1.0-a1 changes [prep-release-3.1.0-a1] Update version to 3.1.0-a1
Diffstat (limited to 'phpBB/phpbb/db/driver/mssqlnative.php')
-rw-r--r--phpBB/phpbb/db/driver/mssqlnative.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/phpbb/db/driver/mssqlnative.php b/phpBB/phpbb/db/driver/mssqlnative.php
index e6002fe1a3..aade311bcb 100644
--- a/phpBB/phpbb/db/driver/mssqlnative.php
+++ b/phpBB/phpbb/db/driver/mssqlnative.php
@@ -471,7 +471,7 @@ class mssqlnative extends \phpbb\db\driver\mssql_base
$query_id = $this->query_result;
}
- if ($cache->sql_exists($query_id))
+ if ($cache && !is_object($query_id) && $cache->sql_exists($query_id))
{
return $cache->sql_freeresult($query_id);
}
@@ -481,6 +481,7 @@ class mssqlnative extends \phpbb\db\driver\mssql_base
unset($this->open_queries[(int) $query_id]);
return @sqlsrv_free_stmt($query_id);
}
+
return false;
}