summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2013-06-24 12:40:51 +0200
committerAndrey Andreev <narf@devilix.net>2013-06-24 12:40:51 +0200
commita2bbb045f262e49e8f3143e17c8466885b3967f9 (patch)
tree421b91f38822e6f5181149e7cf82421935b3c5ef
parentdecc08ece0c57da359882872795ca219b4e6f761 (diff)
parent1d3752c109547919f15b321beb2d5375fc2db150 (diff)
Merge pull request #2403 from groovenectar/loader-fix
Fix for extending classes in a subdirectory (e.g. drivers)
-rw-r--r--system/core/Loader.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/core/Loader.php b/system/core/Loader.php
index 49bd641b1..70a6b6fa6 100644
--- a/system/core/Loader.php
+++ b/system/core/Loader.php
@@ -955,7 +955,7 @@ class CI_Loader {
// Is this a class extension request?
if (file_exists($subclass))
{
- $baseclass = BASEPATH.'libraries/'.$class.'.php';
+ $baseclass = BASEPATH.'libraries/'.$subdir.$class.'.php';
if ( ! file_exists($baseclass))
{