summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Aker <greg.aker@ellislab.com>2011-04-21 20:06:15 +0200
committerGreg Aker <greg.aker@ellislab.com>2011-04-21 20:06:15 +0200
commit8807be35fe02a39624e62a412889e938b6a37691 (patch)
treeefc7eb6e2e157ea56a7e7326bf8e28c5628c4eb1
parente156c6eb4a018a91d3cfcaa2d1fd3b3e67dc2808 (diff)
Flipping around contents of a conditional in _ci_load() so the small bits are on top.
-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))
{