X-Git-Url: http://git.onelab.eu/?p=www-register-wizard.git;a=blobdiff_plain;f=libraries%2FLoader.php;h=781c83c65b018fa3f770503ca6c434b80696df59;hp=b58cc7d7283f19330ba019cdce1d501fc8b4873f;hb=47598daa8c32dbbd72db83dc33f2ce91b3f6f7b0;hpb=4afb2fe256f094a1caf6bff14f51c6a88938cc9f

diff --git a/libraries/Loader.php b/libraries/Loader.php
index b58cc7d..781c83c 100644
--- a/libraries/Loader.php
+++ b/libraries/Loader.php
@@ -6,7 +6,7 @@
  *
  * @package		CodeIgniter
  * @author		ExpressionEngine Dev Team
- * @copyright	Copyright (c) 2008, EllisLab, Inc.
+ * @copyright	Copyright (c) 2008 - 2009, EllisLab, Inc.
  * @license		http://codeigniter.com/user_guide/license.html
  * @link		http://codeigniter.com
  * @since		Version 1.0
@@ -252,7 +252,7 @@ class CI_Loader {
 		require_once(BASEPATH.'database/drivers/'.$CI->db->dbdriver.'/'.$CI->db->dbdriver.'_utility'.EXT);
 		$class = 'CI_DB_'.$CI->db->dbdriver.'_utility';
 
-		$CI->dbutil =& new $class();
+		$CI->dbutil =& instantiate_class(new $class());
 
 		$CI->load->_ci_assign_to_models();
 	}
@@ -868,12 +868,9 @@ class CI_Loader {
 			{
 				include_once(APPPATH.'config/'.strtolower($class).EXT);
 			}			
-			else
+			elseif (file_exists(APPPATH.'config/'.ucfirst(strtolower($class)).EXT))
 			{
-				if (file_exists(APPPATH.'config/'.ucfirst(strtolower($class)).EXT))
-				{
-					include_once(APPPATH.'config/'.ucfirst(strtolower($class)).EXT);
-				}			
+				include_once(APPPATH.'config/'.ucfirst(strtolower($class)).EXT);
 			}
 		}