From 7fcf8ca599f21732a124b8d2610f32a9e4b01c7d Mon Sep 17 00:00:00 2001
From: Rick Ellis <rick.ellis@ellislab.com>
Date: Mon, 5 Feb 2007 22:46:56 +0000
Subject:

---
 system/libraries/Loader.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'system')

diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php
index f76146ffd..38d7c35a8 100644
--- a/system/libraries/Loader.php
+++ b/system/libraries/Loader.php
@@ -697,7 +697,6 @@ class CI_Loader {
 			}
 		
 			// Lets search for the requested library file and load it.
-			$is_duplicate = FALSE;		
 			for ($i = 1; $i < 3; $i++)
 			{
 				$path = ($i % 2) ? APPPATH : BASEPATH;	
@@ -712,8 +711,8 @@ class CI_Loader {
 				// Safety:  Was the class already loaded by a previous call?
 				if (in_array($fp, $this->_ci_classes))
 				{
-					$is_duplicate = TRUE;
-					continue;
+					log_message('debug', $class." class already loaded.Ê Second attempt ignored.");
+					return;
 				}
 				
 				include($fp);
-- 
cgit v1.2.3-24-g4f1b