From fd2750b8f85b4f204e536d255742e18018c3f1f2 Mon Sep 17 00:00:00 2001
From: admin <devnull@localhost>
Date: Fri, 6 Oct 2006 17:29:12 +0000
Subject:

---
 system/libraries/Loader.php | 54 ++++++++++++++++++---------------------------
 1 file changed, 21 insertions(+), 33 deletions(-)

(limited to 'system/libraries/Loader.php')

diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php
index 2534e6965..6809054e5 100644
--- a/system/libraries/Loader.php
+++ b/system/libraries/Loader.php
@@ -110,7 +110,9 @@ class CI_Loader {
 	function database($db = '', $return = FALSE, $active_record = FALSE)
 	{
 		$obj =& get_instance();
-	
+
+		return DB($params, $return, $active_record);
+
 		if ($return === TRUE)
 		{
 			return $obj->_ci_init_database($db, TRUE, $active_record);
@@ -124,20 +126,6 @@ class CI_Loader {
 	
 	// --------------------------------------------------------------------
 	
-	/**
-	 * Database Utiliy Loader
-	 *
-	 * @access	public
-	 * @return	object
-	 */	
-	function dbutil()
-	{
-		$obj =& get_instance();
-		$obj->_ci_init_dbextra('dbutil');
-	}
-
-	// --------------------------------------------------------------------
-	
 	/**
 	 * Scaffolding Loader
 	 *
@@ -336,7 +324,24 @@ class CI_Loader {
 		
 		log_message('debug', 'Plugins loaded: '.implode(', ', $plugins));
 	}
+
+	// --------------------------------------------------------------------
 	
+	/**
+	 * Load Plugins
+	 *
+	 * This is simply an alias to the above function in case the
+	 * user has written the plural form of this function.
+	 *
+	 * @access	public
+	 * @param	array
+	 * @return	void
+	 */
+	function plugins($plugins = array())
+	{
+		$this->plugin($plugins);
+	}
+
 	// --------------------------------------------------------------------
 	
 	/**
@@ -380,24 +385,7 @@ class CI_Loader {
 		
 		log_message('debug', 'Scripts loaded: '.implode(', ', $scripts));
 	}
-	
-	// --------------------------------------------------------------------
-	
-	/**
-	 * Load Plugins
-	 *
-	 * This is simply an alias to the above function in case the
-	 * user has written the plural form of this function.
-	 *
-	 * @access	public
-	 * @param	array
-	 * @return	void
-	 */
-	function plugins($plugins = array())
-	{
-		$this->plugin($plugins);
-	}
-	
+		
 	// --------------------------------------------------------------------
 	
 	/**
-- 
cgit v1.2.3-24-g4f1b