diff options
| author | Alex Bilbie <alex@alexbilbie.com> | 2012-09-03 19:58:29 +0200 |
|---|---|---|
| committer | Alex Bilbie <alex@alexbilbie.com> | 2012-09-03 19:58:29 +0200 |
| commit | ffeaf809d5d1fbb0a506ff2fcdc9cbe2c657e1e4 (patch) | |
| tree | f0337dc5c2566bf53f260f08d39547aa2f7858be /system/core | |
| parent | 5e9710842dc6981f4eb03c1622eabee9b3171dea (diff) | |
| parent | e775b864b741ee0a44b09739c18e71abdadc1291 (diff) | |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into codeigniter/develop
Diffstat (limited to 'system/core')
| -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 0d05649ca..89b2028bf 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; } |