diff options
| author | Derek Jones <derek.jones@ellislab.com> | 2011-08-25 14:24:06 +0200 |
|---|---|---|
| committer | Derek Jones <derek.jones@ellislab.com> | 2011-08-25 14:24:06 +0200 |
| commit | be72bd2d1cdba222bbbce547e1603de1e4ec7961 (patch) | |
| tree | 850711b8f4e981fcd1bf51151b1d71d53f630076 /system/core/Loader.php | |
| parent | 4bc4c1476344f96ebb920677f608cb185a48eaed (diff) | |
| parent | 9ff6336415f3da2a81142cb23343060df6196ebe (diff) | |
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop
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')) { |