diff options
| author | Andrey Andreev <narf@devilix.net> | 2015-12-12 16:22:09 +0100 |
|---|---|---|
| committer | Andrey Andreev <narf@devilix.net> | 2015-12-12 16:22:09 +0100 |
| commit | c424b3e1e3d95d06a32b5a9d35fa294b11384a8a (patch) | |
| tree | 1643cfae87218b0bb67461dd71b4ab2b53ba4450 | |
| parent | 7ec771b7592080b231b726abd9f980b7c428b418 (diff) | |
| parent | ac0e0bf62d483d1b7db86fe760447ca0dd83baf2 (diff) | |
Merge branch 'develop' of github.com:halmai/CodeIgniter into db/init_exception
| -rw-r--r-- | system/database/DB_driver.php | 2 | ||||
| -rw-r--r-- | user_guide_src/source/changelog.rst | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php index bc016efbf..f3aeb7f81 100644 --- a/system/database/DB_driver.php +++ b/system/database/DB_driver.php @@ -436,7 +436,7 @@ abstract class CI_DB_driver { $this->display_error('db_unable_to_connect'); } - return FALSE; + throw new RuntimeException('Database connection failure.'); } } diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 986525437..5a41fa18b 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -11,6 +11,10 @@ Release Date: Not Released - Added UNIX socket connection support to :doc:`Session Library <libraries/sessions>` 'redis' driver. +- Database + + - CI_DB_driver::initialize() throws a "Database connection failure." RuntimeException if couldn't connect to the database. + Version 3.0.4 ============= |