[ticket/12802] Properly handle connection failures in SQLite3

PHPBB3-12802
This commit is contained in:
Patrick Webster 2014-07-03 13:05:54 -05:00 committed by Patrick Webster
parent ad11925c77
commit 3ca708edad

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->dbo = new \SQLite3($this->server, SQLITE3_OPEN_READWRITE | SQLITE3_OPEN_CREATE);
$this->db_connect_id = true; $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; return true;
@ -272,7 +273,7 @@ class sqlite3 extends \phpbb\db\driver\driver
*/ */
protected function _sql_error() protected function _sql_error()
{ {
if (class_exists('SQLite3', false)) if (class_exists('SQLite3', false) && isset($this->dbo))
{ {
$error = array( $error = array(
'message' => $this->dbo->lastErrorMsg(), 'message' => $this->dbo->lastErrorMsg(),