diff options
| author | Eric Barnes <eric@ericlbarnes.com> | 2011-08-29 05:59:15 +0200 |
|---|---|---|
| committer | Eric Barnes <eric@ericlbarnes.com> | 2011-08-29 05:59:15 +0200 |
| commit | 65faf9fb927cd20bc0b98f0f33ae662a2611c6de (patch) | |
| tree | ed0677704edeb364ed17080b8c993e894550c024 /system/core/Loader.php | |
| parent | 91249f1154c6cc078afbf23faa60b9f6414ab597 (diff) | |
| parent | 4f17de94737f5eb9e1230f7d854dea611ebd9901 (diff) | |
Merge branch 'develop' into feature/unit-tests
Diffstat (limited to 'system/core/Loader.php')
| -rwxr-xr-x | system/core/Loader.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/system/core/Loader.php b/system/core/Loader.php index e7fa3d3f6..de0fc06d2 100755 --- a/system/core/Loader.php +++ b/system/core/Loader.php @@ -127,7 +127,7 @@ class CI_Loader { $this->_ci_library_paths = array(APPPATH, BASEPATH); $this->_ci_helper_paths = array(APPPATH, BASEPATH); $this->_ci_model_paths = array(APPPATH); - $this->_ci_view_paths = array(APPPATH.'views/' => TRUE); + $this->_ci_view_paths = array(VIEWPATH => TRUE); log_message('debug', "Loader Class Initialized"); } @@ -1106,7 +1106,7 @@ class CI_Loader { * @param array * @return void */ - private function _ci_autoloader() + protected function _ci_autoloader() { if (defined('ENVIRONMENT') AND file_exists(APPPATH.'config/'.ENVIRONMENT.'/autoload.php')) { |