summaryrefslogtreecommitdiffstats
path: root/system/core/Controller.php
diff options
context:
space:
mode:
Diffstat (limited to 'system/core/Controller.php')
-rw-r--r--system/core/Controller.php9
1 files changed, 3 insertions, 6 deletions
diff --git a/system/core/Controller.php b/system/core/Controller.php
index 469663f09..107d3f346 100644
--- a/system/core/Controller.php
+++ b/system/core/Controller.php
@@ -1,4 +1,4 @@
-<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
+<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed');
/**
* CodeIgniter
*
@@ -37,7 +37,7 @@ class CI_Controller {
public function __construct()
{
self::$instance =& $this;
-
+
// Assign all the class objects that were instantiated by the
// bootstrap file (CodeIgniter.php) to local class variables
// so that CI can run as one big super object.
@@ -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()