diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2014-07-07 22:10:04 +0200 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2014-07-07 22:10:04 +0200 |
| commit | d5f693c9fdec34c872e185eed8b0ecac65a07e0e (patch) | |
| tree | 1203c888713492ea3e3869e377d83273718363e8 | |
| parent | 85d241218e93cb25f29e87b5c1e6bb0cf82c9a5f (diff) | |
| parent | 42fde81b21968704dd00ef514fe4035aa174968d (diff) | |
| download | forums-d5f693c9fdec34c872e185eed8b0ecac65a07e0e.tar forums-d5f693c9fdec34c872e185eed8b0ecac65a07e0e.tar.gz forums-d5f693c9fdec34c872e185eed8b0ecac65a07e0e.tar.bz2 forums-d5f693c9fdec34c872e185eed8b0ecac65a07e0e.tar.xz forums-d5f693c9fdec34c872e185eed8b0ecac65a07e0e.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12802] Properly handle connection failures in SQLite3
| -rw-r--r-- | phpBB/phpbb/db/driver/sqlite3.php | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/phpBB/phpbb/db/driver/sqlite3.php b/phpBB/phpbb/db/driver/sqlite3.php index 6511c755a0..0922229e0a 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; @@ -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(), |