diff options
| author | Greg Aker <greg.aker@ellislab.com> | 2011-04-20 16:40:21 +0200 |
|---|---|---|
| committer | Greg Aker <greg.aker@ellislab.com> | 2011-04-20 16:40:21 +0200 |
| commit | 79f4a39198be096c18dc802ca25444c8c955822a (patch) | |
| tree | 22dcb05e73d74371013330149cd451ca70ffd594 /system/core/Controller.php | |
| parent | b3e614d8b2293c079bcfb9cfdf071c041cbc4722 (diff) | |
| parent | 0c9ee4a348a9e0c9ee6d6c0085e463e098e453f4 (diff) | |
Automated merge with http://hg.ellislab.com/CodeIgniter-Reactor
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() |