From 07ad666409b60610a1e5b07368506f9f0ca45b22 Mon Sep 17 00:00:00 2001
From: admin <devnull@localhost>
Date: Tue, 3 Oct 2006 06:12:52 +0000
Subject:

---
 system/codeigniter/Base5.php | 32 ++++++++++++--------------------
 1 file changed, 12 insertions(+), 20 deletions(-)

(limited to 'system/codeigniter')

diff --git a/system/codeigniter/Base5.php b/system/codeigniter/Base5.php
index ef3fc67f4..a0beea46c 100644
--- a/system/codeigniter/Base5.php
+++ b/system/codeigniter/Base5.php
@@ -32,31 +32,23 @@
 
 class CI_Base {
 
-	public function CI_Base()
-	{
-		$instance =& _load_class('Instance');
-		$instance->set_instance($this);
-	}
-}
-
-class Instance {
-	public static $instance;
+    public static $instance;
 
-	public function set_instance(&$object)
-	{
-		self::$instance =& $object;
-	}
-	
-	public function &get_instance()
-	{
-		return self::$instance;
-	}
+    public function CI_Base()
+    {
+        self::$instance =& $this;
+    }
+    
+    public static function &get_instance()
+    {
+        return self::$instance;
+    }
 }
 
 function &get_instance()
 {
-	$instance =& _load_class('Instance');
-	return $instance->get_instance();	
+    return CI_Base::get_instance();    
 }
 
+
 ?>
\ No newline at end of file
-- 
cgit v1.2.3-24-g4f1b