From d48ef1c8e2e84067a58818291935593d70e491f8 Mon Sep 17 00:00:00 2001
From: admin <devnull@localhost>
Date: Thu, 21 Sep 2006 06:22:05 +0000
Subject:

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

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

diff --git a/system/libraries/Controller.php b/system/libraries/Controller.php
index 768b154e8..5a32e65c0 100644
--- a/system/libraries/Controller.php
+++ b/system/libraries/Controller.php
@@ -232,16 +232,20 @@ class Controller extends CI_Base {
 		}
 		unset($autoload['config']);
 		
-		if ( ! is_array($autoload['core']))
+		// A little tweak to remain backward compatible
+		// The $autoload['core'] item was deprecated
+		if ( ! isset($autoload['libraries']))
 		{
-			$autoload['core'] = array($autoload['core']);
+			$autoload['libraries'] = $autoload['core'];
+		
 		}
 		
-		foreach ($autoload['core'] as $item)
+		foreach ($autoload['libraries'] as $item)
 		{
 			$this->_ci_initialize($item);
 		}
-		
+		unset($autoload['libraries']);
+
 		return $autoload;
 	}
   	// END _ci_autoload()
-- 
cgit v1.2.3-24-g4f1b