diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-10-15 18:40:43 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-10-15 18:40:43 +0200 |
| commit | 3521dfc2787a532365dba12eec669579d15d79f2 (patch) | |
| tree | 9e606800cdde4e3051ed8eae0685afdc4b8c1929 /phpBB/phpbb/db/driver/mysql.php | |
| parent | 40932c26eaa7cddd0731b136a77c9bad704b69e0 (diff) | |
| parent | a35721f68c95153f46dd67ea465addedf82f538e (diff) | |
| download | forums-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/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); } |