Merge branch 'develop' of github.com:halmai/CodeIgniter into db/init_exception

narfbg · narfbg · commit c424b3e1e3d9 · 2015-12-12T17:22:09.000+02:00
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
@@ -436,7 +436,7 @@ public function initialize()
 					$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
@@ -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
 =============

Original file line number	Diff line number	Diff line change
`@@ -436,7 +436,7 @@ public function initialize()`
`436`	`436`	`$this->display_error('db_unable_to_connect');`
`437`	`437`	`}`
`438`	`438`
`439`		`- return FALSE;`
	`439`	`+ throw new RuntimeException('Database connection failure.');`
`440`	`440`	`}`
`441`	`441`	`}`
`442`	`442`