diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-10-15 15:39:12 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-10-15 15:39:12 +0200 |
| commit | 8dc824d4b363ee21bad3b6a7f53fa57b73763a52 (patch) | |
| tree | f647755f3e2323a4fab351edaa3c60d641183946 /phpBB/phpbb/db/driver/sqlite.php | |
| parent | 7a46976a785bd2a89004ecdce69662b2ece2ed4d (diff) | |
| parent | 76ddf1ca4143f38f3bf8fc6aabdb3fa302d6ed40 (diff) | |
| download | forums-8dc824d4b363ee21bad3b6a7f53fa57b73763a52.tar forums-8dc824d4b363ee21bad3b6a7f53fa57b73763a52.tar.gz forums-8dc824d4b363ee21bad3b6a7f53fa57b73763a52.tar.bz2 forums-8dc824d4b363ee21bad3b6a7f53fa57b73763a52.tar.xz forums-8dc824d4b363ee21bad3b6a7f53fa57b73763a52.zip | |
Merge remote-tracking branch 'noxwizard/ticket/11918' into prep-release-3.1.0-a1
* noxwizard/ticket/11918:
[ticket/11918] Make sql_freeresult() consistent across all DB drivers
Diffstat (limited to 'phpBB/phpbb/db/driver/sqlite.php')
| -rw-r--r-- | phpBB/phpbb/db/driver/sqlite.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/db/driver/sqlite.php b/phpBB/phpbb/db/driver/sqlite.php index a548fd2618..55a33284f2 100644 --- a/phpBB/phpbb/db/driver/sqlite.php +++ b/phpBB/phpbb/db/driver/sqlite.php @@ -261,7 +261,7 @@ class sqlite 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); } |