diff options
author | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-01-08 03:36:53 +0100 |
---|---|---|
committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-01-08 03:36:53 +0100 |
commit | f1f2492b7c8d3be71d9550017865eec952035811 (patch) | |
tree | 4bc81dee762b95b94a90d8bc10cf26d96d3d7d4a /system/core/Controller.php | |
parent | 3a1c2ee938fd971b7adc4bf02bfc4432e0d84b77 (diff) | |
parent | fdc63828a876e87742380a4ae077e43f514320b8 (diff) |
Merge pull request #885 from narfbg/develop-core-ce
Improve core Controller & Exceptions libraries
Diffstat (limited to 'system/core/Controller.php')
-rw-r--r-- | system/core/Controller.php | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/system/core/Controller.php b/system/core/Controller.php index 55b3ec235..0dc131701 100644 --- a/system/core/Controller.php +++ b/system/core/Controller.php @@ -1,13 +1,13 @@ -<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed'); +<?php if ( ! defined('BASEPATH')) exit('No direct script access allowed'); /** * CodeIgniter * * An open source application development framework for PHP 5.1.6 or newer * * NOTICE OF LICENSE - * + * * Licensed under the Open Software License version 3.0 - * + * * This source file is subject to the Open Software License (OSL 3.0) that is * bundled with this package in the files license.txt / license.rst. It is * also available through the world wide web at this URL: @@ -43,13 +43,10 @@ class CI_Controller { private static $instance; - /** - * Constructor - */ 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. @@ -59,10 +56,8 @@ class CI_Controller { } $this->load =& load_class('Loader', 'core'); - $this->load->initialize(); - - log_message('debug', "Controller Class Initialized"); + log_message('debug', 'Controller Class Initialized'); } public static function &get_instance() @@ -70,7 +65,6 @@ class CI_Controller { return self::$instance; } } -// END Controller class /* End of file Controller.php */ -/* Location: ./system/core/Controller.php */
\ No newline at end of file +/* Location: ./system/core/Controller.php */ |