diff options
author | Joas Schilling <nickvergessen@gmx.de> | 2014-08-07 12:09:01 +0200 |
---|---|---|
committer | Joas Schilling <nickvergessen@gmx.de> | 2014-08-07 12:09:01 +0200 |
commit | 58d1dcc7f2872b2c9116254d0eae3a5ee1bea48e (patch) | |
tree | ac804c383316e276dedb3c8058a4dd8676928376 /phpBB/phpbb/db/driver/sqlite3.php | |
parent | 89a6fed91d9344152f0b2a0779d3d458f3311ecf (diff) | |
parent | cc32ee8a2848b902f7dc9d809499855a78cb41f4 (diff) | |
download | forums-58d1dcc7f2872b2c9116254d0eae3a5ee1bea48e.tar forums-58d1dcc7f2872b2c9116254d0eae3a5ee1bea48e.tar.gz forums-58d1dcc7f2872b2c9116254d0eae3a5ee1bea48e.tar.bz2 forums-58d1dcc7f2872b2c9116254d0eae3a5ee1bea48e.tar.xz forums-58d1dcc7f2872b2c9116254d0eae3a5ee1bea48e.zip |
Merge pull request #2637 from Nicofuma/ticket/12387
[ticket/12387] Cleanup *_free_result call and remove @ on that call
* Nicofuma/ticket/12387:
[ticket/12387] Fix a call to sql_freeresult in full_text_native
[ticket/12387] Fix \phpbb\db\driver\mysqli::sql_freeresult
[ticket/12387] Use the hash as query_id for caching
[ticket/12387] Remove unnecessary checks
[ticket/12387] mssql_query return true if a select query returns 0 row
[ticket/12387] Cleanup *_free_result call and remove @ on that call
Diffstat (limited to 'phpBB/phpbb/db/driver/sqlite3.php')
-rw-r--r-- | phpBB/phpbb/db/driver/sqlite3.php | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/phpBB/phpbb/db/driver/sqlite3.php b/phpBB/phpbb/db/driver/sqlite3.php index 0922229e0a..5548105006 100644 --- a/phpBB/phpbb/db/driver/sqlite3.php +++ b/phpBB/phpbb/db/driver/sqlite3.php @@ -147,6 +147,11 @@ class sqlite3 extends \phpbb\db\driver\driver $this->sql_time += microtime(true) - $this->curtime; } + if (!$this->query_result) + { + return false; + } + if ($cache && $cache_ttl) { $this->query_result = $cache->sql_save($this, $query, $this->query_result, $cache_ttl); @@ -371,9 +376,12 @@ class sqlite3 extends \phpbb\db\driver\driver $endtime = $endtime[0] + $endtime[1]; $result = $this->dbo->query($query); - while ($void = $result->fetchArray(SQLITE3_ASSOC)) + if ($result) { - // Take the time spent on parsing rows into account + while ($void = $result->fetchArray(SQLITE3_ASSOC)) + { + // Take the time spent on parsing rows into account + } } $splittime = explode(' ', microtime()); |