From cf49390d3d699d878eb6e151745e80285465ddb9 Mon Sep 17 00:00:00 2001
From: admin <devnull@localhost>
Date: Tue, 10 Oct 2006 07:12:31 +0000
Subject:

---
 system/libraries/Controller.php | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

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

diff --git a/system/libraries/Controller.php b/system/libraries/Controller.php
index 4b9e3e960..c80097a17 100644
--- a/system/libraries/Controller.php
+++ b/system/libraries/Controller.php
@@ -80,20 +80,13 @@ class Controller extends CI_Base {
 		if (floor(phpversion()) >= 5)
 		{
 			$this->load = new CI_Loader();
+			$this->load->_ci_use_instance = TRUE;
+			$this->load->_ci_autoloader();
 		}
-
-		// Load everything specified in the autoload.php file
-		$this->load->_ci_autoloader();
-
-		// This allows anything loaded using $this->load (viwes, files, etc.)
-		// to become accessible from within the Controller class functions.
-		foreach (get_object_vars($this) as $key => $var)
+		else
 		{
-			if (is_object($var))
-			{
-				$this->load->$key =& $this->$key;
-			}
-		}	
+			$this->_ci_autoloader();
+		}
 	}
     
 	// --------------------------------------------------------------------
-- 
cgit v1.2.3-24-g4f1b