From afb056afd8335dd972f4e6d84b652641663ab6f4 Mon Sep 17 00:00:00 2001
From: Rick Ellis <rick.ellis@ellislab.com>
Date: Tue, 12 Aug 2008 00:44:25 +0000
Subject:

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

(limited to 'system')

diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php
index ec09f00c6..e5640b070 100644
--- a/system/libraries/Loader.php
+++ b/system/libraries/Loader.php
@@ -783,7 +783,7 @@ class CI_Loader {
 		// We'll test for both lowercase and capitalized versions of the file name
 		foreach (array(ucfirst($class), strtolower($class)) as $class)
 		{
-			$subclass = APPPATH.'libraries/'.config_item('subclass_prefix').$class.EXT;
+			$subclass = APPPATH.'libraries/'.$subdir.config_item('subclass_prefix').$class.EXT;
 
 			// Is this a class extension request?			
 			if (file_exists($subclass))
@@ -816,7 +816,7 @@ class CI_Loader {
 			for ($i = 1; $i < 3; $i++)
 			{
 				$path = ($i % 2) ? APPPATH : BASEPATH;	
-				$filepath = $path.'libraries/'.$class.EXT;
+				$filepath = $path.'libraries/'.$subdir.$class.EXT;
 				
 				// Does the file exist?  No?  Bummer...
 				if ( ! file_exists($filepath))
-- 
cgit v1.2.3-24-g4f1b