rolling back previous solution; throwing exception if database connection was not successful.

2 files changed, 1 insertions, 5 deletions

diff --git a/system/core/Loader.php b/system/core/Loader.php
index 7593ae5d6..18e4c5287 100644
--- a/system/core/Loader.php
+++ b/system/core/Loader.php
@@ -361,10 +361,6 @@ class CI_Loader {
 
 		// Load the DB class
 		$CI->db =& DB($params, $query_builder);
-		if (!$CI->db->conn_id) 
-		{
-			return FALSE;
-		}
 		return $this;
 	}
 
diff --git a/system/database/DB_driver.php b/system/database/DB_driver.php
index 25e70ec3f..fb9955b7c 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.');
 			}
 		}