summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRick Ellis <rick.ellis@ellislab.com>2008-08-12 02:44:25 +0200
committerRick Ellis <rick.ellis@ellislab.com>2008-08-12 02:44:25 +0200
commitafb056afd8335dd972f4e6d84b652641663ab6f4 (patch)
tree65b229b0c3874fe6872d181f20d05ff6819805fd
parent0ea8f9877eb2b47abffe9a02fee7ea9fa066015d (diff)
-rw-r--r--system/libraries/Loader.php4
1 files changed, 2 insertions, 2 deletions
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))