diff options
| author | dchill42 <dchill42@gmail.com> | 2012-10-10 14:16:39 +0200 |
|---|---|---|
| committer | dchill42 <dchill42@gmail.com> | 2012-10-10 14:16:39 +0200 |
| commit | 2716398bd2f2ae36d7420c591fc759e0951ba0e2 (patch) | |
| tree | 3845d6bacc5660559740a8eddd43210bbb14fefd /system/core/Loader.php | |
| parent | eeb6a480a4a25b7fe96e9ba0cf3aef273fd13c67 (diff) | |
| parent | e8bc5f4450381b4f978f274f3e93604301115b64 (diff) | |
Merge branch 'develop' of github.com:/EllisLab/CodeIgniter into load_config_units
Diffstat (limited to 'system/core/Loader.php')
| -rw-r--r-- | system/core/Loader.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/system/core/Loader.php b/system/core/Loader.php index 242b19069..ed830e2dd 100644 --- a/system/core/Loader.php +++ b/system/core/Loader.php @@ -779,11 +779,11 @@ class CI_Loader { $_ci_ext = pathinfo($_ci_view, PATHINFO_EXTENSION); $_ci_file = ($_ci_ext === '') ? $_ci_view.'.php' : $_ci_view; - foreach ($this->_ci_view_paths as $view_file => $cascade) + foreach ($this->_ci_view_paths as $_ci_view_file => $cascade) { - if (file_exists($view_file.$_ci_file)) + if (file_exists($_ci_view_file.$_ci_file)) { - $_ci_path = $view_file.$_ci_file; + $_ci_path = $_ci_view_file.$_ci_file; $file_exists = TRUE; break; } |