From 3ca708edadce1c82903559f384fd15638d0ab2de Mon Sep 17 00:00:00 2001
From: Patrick Webster <noxwizard@phpbb.com>
Date: Thu, 3 Jul 2014 13:05:54 -0500
Subject: [ticket/12802] Properly handle connection failures in SQLite3

PHPBB3-12802
---
 phpBB/phpbb/db/driver/sqlite3.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'phpBB/phpbb/db/driver/sqlite3.php')

diff --git a/phpBB/phpbb/db/driver/sqlite3.php b/phpBB/phpbb/db/driver/sqlite3.php
index 2c6bf99497..36d8a83f4b 100644
--- a/phpBB/phpbb/db/driver/sqlite3.php
+++ b/phpBB/phpbb/db/driver/sqlite3.php
@@ -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;
@@ -272,7 +273,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(),
-- 
cgit v1.2.1