diff options
| author | Alex Bilbie <alex@alexbilbie.com> | 2012-09-02 11:07:50 +0200 |
|---|---|---|
| committer | Alex Bilbie <alex@alexbilbie.com> | 2012-09-02 11:07:50 +0200 |
| commit | 4e80d80ae6bda06b8c3bf2c041ab695b9d077340 (patch) | |
| tree | ce70dddcd93812c3fd8311c804153e1689b39c76 | |
| parent | c55708357b79899db984a058cab19d13be1e6ea9 (diff) | |
| parent | 64f470bfb9b4aa4e0abc984dacd543bb7d059260 (diff) | |
Merge pull request #1727 from pickupman/bugfix-loader-view_file
Fix bug #1000
| -rw-r--r-- | system/core/Loader.php | 6 | ||||
| -rw-r--r-- | user_guide_src/source/changelog.rst | 1 |
2 files changed, 4 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; } diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index eb4f1e762..578e60ec0 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -337,6 +337,7 @@ Bug fixes for 3.0 - Fixed a bug (#1613) - :doc:`Form Helper <helpers/form_helper>` functions ``form_multiselect()``, ``form_dropdown()`` didn't properly handle empty array option groups. - Fixed a bug (#1605) - :doc:`Pagination Library <libraries/pagination>` produced incorrect *previous* and *next* link values. - Fixed a bug in SQLSRV's ``affected_rows()`` method where an erroneous function name was used. +- Fixed a bug (#1000) - Change syntax of $view_file to $_ci_view_file to prevent being overwritten by application. Version 2.1.2 ============= |