1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00

[ticket/12387] Cleanup *_free_result call and remove @ on that call

PHPBB3-12387
This commit is contained in:
Tristan Darricau
2014-06-22 18:08:38 +02:00
parent afe9d3c3f3
commit 2276c1c0f2
10 changed files with 231 additions and 137 deletions

View File

@@ -50,7 +50,7 @@ class sqlite3 extends \phpbb\db\driver\driver
$this->dbo = new \SQLite3($this->server, SQLITE3_OPEN_READWRITE | SQLITE3_OPEN_CREATE);
$this->db_connect_id = true;
}
catch (Exception $e)
catch (\Exception $e)
{
return array('message' => $e->getMessage());
}
@@ -138,6 +138,11 @@ class sqlite3 extends \phpbb\db\driver\driver
$this->sql_report('stop', $query);
}
if (!$this->query_result)
{
return false;
}
if ($cache && $cache_ttl)
{
$this->query_result = $cache->sql_save($this, $query, $this->query_result, $cache_ttl);
@@ -362,9 +367,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());