diff options
| author | Greg Aker <greg.aker@ellislab.com> | 2011-04-21 20:07:08 +0200 |
|---|---|---|
| committer | Greg Aker <greg.aker@ellislab.com> | 2011-04-21 20:07:08 +0200 |
| commit | 2febbef34d6427a176e16d5ca69c9f23ffee6b0e (patch) | |
| tree | 6c742272beaab4a364bf44a924bcf22daf6cf3bc /system/core/Loader.php | |
| parent | 4d2bb09cbb4fc66dc4881c2ffdeee7dbaf0a3a3b (diff) | |
| parent | 8807be35fe02a39624e62a412889e938b6a37691 (diff) | |
Branch Merge.
Diffstat (limited to 'system/core/Loader.php')
| -rw-r--r-- | system/core/Loader.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/system/core/Loader.php b/system/core/Loader.php index a52ef288a..721c196cc 100644 --- a/system/core/Loader.php +++ b/system/core/Loader.php @@ -647,7 +647,12 @@ class CI_Loader { $file_exists = FALSE; // Set the path to the requested file - if ($_ci_path == '') + if ($_ci_path != '') + { + $_ci_x = explode('/', $_ci_path); + $_ci_file = end($_ci_x); + } + else { $_ci_ext = pathinfo($_ci_view, PATHINFO_EXTENSION); $_ci_file = ($_ci_ext == '') ? $_ci_view.'.php' : $_ci_view; @@ -667,11 +672,6 @@ class CI_Loader { } } } - else - { - $_ci_x = explode('/', $_ci_path); - $_ci_file = end($_ci_x); - } if ( ! $file_exists && ! file_exists($_ci_path)) { |