upgrade to codeigniter 1.7.2 for f12

[www-register-wizard.git] / libraries / Loader.php

diff --git a/libraries/Loader.php b/libraries/Loader.php
index b58cc7d..781c83c 100644 (file)
--- 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);
                        }
                }