8 files changed, 11 insertions, 10 deletions

diff --git a/system/libraries/Config.php b/system/libraries/Config.php
index 26770cc4f..82836b1f3 100644
--- a/system/libraries/Config.php
+++ b/system/libraries/Config.php
@@ -44,7 +44,7 @@ class CI_Config {
      */
 	function CI_Config()
 	{
-		$this->config =& _get_config();
+		$this->config = get_config();
 		log_message('debug', "Config Class Initialized");
 	}
   	// END CI_Config()
diff --git a/system/libraries/Controller.php b/system/libraries/Controller.php
index 7a3f5e5d5..938c46e4c 100644
--- a/system/libraries/Controller.php
+++ b/system/libraries/Controller.php
@@ -73,7 +73,7 @@ class Controller extends CI_Base {
 		
 		foreach ($classes as $var => $class)
 		{
-			$this->$var =& _load_class($class);
+			$this->$var =& load_class($class);
 		}
 		
 		
diff --git a/system/libraries/Hooks.php b/system/libraries/Hooks.php
index 8767e10d0..e2d0500c0 100644
--- a/system/libraries/Hooks.php
+++ b/system/libraries/Hooks.php
@@ -53,7 +53,7 @@ class CI_Hooks {
 	 */  	
   	function _initialize()
   	{
-		$CFG =& _load_class('Config');
+		$CFG =& load_class('Config');
 		
 		// If hooks are not enabled in the config file
 		// there is nothing else to do
diff --git a/system/libraries/Input.php b/system/libraries/Input.php
index 0d3c87b49..72344e343 100644
--- a/system/libraries/Input.php
+++ b/system/libraries/Input.php
@@ -44,7 +44,7 @@ class CI_Input {
 	{	
 		log_message('debug', "Input Class Initialized");
 	
-		$CFG =& _load_class('Config');
+		$CFG =& load_class('Config');
 		$this->use_xss_clean	= ($CFG->item('global_xss_filtering') === TRUE) ? TRUE : FALSE;
 		$this->allow_get_array	= ($CFG->item('enable_query_strings') === TRUE) ? TRUE : FALSE;		
 		$this->_sanitize_globals();
@@ -306,7 +306,8 @@ class CI_Input {
 		
 		if ($this->ip_address === FALSE)
 		{
-			return $this->ip_address = '0.0.0.0';
+			$this->ip_address = '0.0.0.0';
+			return $this->ip_address;
 		}
 		
 		if (strstr($this->ip_address, ','))
diff --git a/system/libraries/Log.php b/system/libraries/Log.php
index eff7cb7fc..09538fa0b 100644
--- a/system/libraries/Log.php
+++ b/system/libraries/Log.php
@@ -42,7 +42,7 @@ class CI_Log {
 	 */
 	function CI_Log()
 	{
-		$config =& _get_config();
+		$config = get_config();
 		
 		$this->log_path = ($config['log_path'] != '') ? $config['log_path'] : BASEPATH.'logs/';
 		
diff --git a/system/libraries/Output.php b/system/libraries/Output.php
index 507beab59..7e859453e 100644
--- a/system/libraries/Output.php
+++ b/system/libraries/Output.php
@@ -299,8 +299,8 @@ class CI_Output {
 	 */	
 	function _display_cache(&$CFG, &$RTR)
 	{
-		$CFG =& _load_class('Config');
-		$RTR =& _load_class('Router');
+		$CFG =& load_class('Config');
+		$RTR =& load_class(('Router');
 	
 		$cache_path = ($CFG->item('cache_path') == '') ? BASEPATH.'cache/' : $CFG->item('cache_path');
 			
diff --git a/system/libraries/Router.php b/system/libraries/Router.php
index 27e3c27cc..dab84883e 100644
--- a/system/libraries/Router.php
+++ b/system/libraries/Router.php
@@ -48,7 +48,7 @@ class CI_Router {
 	 */
 	function CI_Router()
 	{
-		$this->config =& _load_class('Config');
+		$this->config =& load_class('Config');
 		$this->_set_route_mapping();
 		log_message('debug', "Router Class Initialized");
 	}
diff --git a/system/libraries/URI.php b/system/libraries/URI.php
index 80b112660..fcf6afe4b 100644
--- a/system/libraries/URI.php
+++ b/system/libraries/URI.php
@@ -42,7 +42,7 @@ class CI_URI {
 	 */		
 	function CI_URI()
 	{
-		$this->router =& _load_class('Router');	
+		$this->router =& load_class('Router');	
 		log_message('debug', "URI Class Initialized");
 	}