summaryrefslogtreecommitdiffstats
path: root/system/core
diff options
context:
space:
mode:
Diffstat (limited to 'system/core')
-rw-r--r--system/core/Loader.php12
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))
{