mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-09 19:26:53 +02:00
Merge pull request #2690 from Noxwizard/ticket/12802
[ticket/12802] Properly handle connection failures in SQLite3 * Noxwizard/ticket/12802: [ticket/12802] Properly handle connection failures in SQLite3
This commit is contained in:
@ -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;
|
||||||
@ -280,7 +281,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(),
|
||||||
|
Reference in New Issue
Block a user