diff options
| author | Greg Aker <greg.aker@ellislab.com> | 2011-04-20 16:40:17 +0200 |
|---|---|---|
| committer | Greg Aker <greg.aker@ellislab.com> | 2011-04-20 16:40:17 +0200 |
| commit | 0c9ee4a348a9e0c9ee6d6c0085e463e098e453f4 (patch) | |
| tree | cf260d43460bb732a6925b1550235ade9774ee7f /system/core/Controller.php | |
| parent | f5c840241084e03d49e521bfcb62d2adbe9fce7d (diff) | |
Refactoring the loader to set protected class variables.
Moved _ci_autoload(), which is used in CI_Controller to be a public method. Also added CI_Loader::set_base_classes() to be called in the controller so we're not setting protected vars in another class.
Also refactored in the form_helper so it's not trying to access protected vars in CI_Loader. Added the is_loaded() method to the loader to take care of the checks that were being done there.
Diffstat (limited to 'system/core/Controller.php')
| -rw-r--r-- | system/core/Controller.php | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/system/core/Controller.php b/system/core/Controller.php index fd9c8b580..ec86b7920 100644 --- a/system/core/Controller.php +++ b/system/core/Controller.php @@ -48,12 +48,9 @@ class CI_Controller { $this->load =& load_class('Loader', 'core'); - $this->load->_base_classes =& is_loaded(); - - $this->load->ci_autoloader(); - + $this->load->set_base_classes()->ci_autoloader(); + log_message('debug', "Controller Class Initialized"); - } public static function &get_instance() |