makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-25 04:38:53 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop-ascraeus' into develop

Browse source 
* develop-ascraeus:
  [ticket/12802] Properly handle connection failures in SQLite3
This commit is contained in:
Tristan Darricau 2014-07-07 22:10:04 +02:00
commit d5f693c9fd
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
phpBB/phpbb/db/driver/sqlite3.php
View file

@ -50,9 +50,10 @@ 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());
$this->connect_error = $e->getMessage();
return array('message' => $this->connect_error);
}
return true;
@ -280,7 +281,7 @@ class sqlite3 extends \phpbb\db\driver\driver
*/
protected function _sql_error()
{
if (class_exists('SQLite3', false))
if (class_exists('SQLite3', false) && isset($this->dbo))
{
$error = array(
'message' => $this->dbo->lastErrorMsg(),