diff options
| author | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-04-26 23:44:22 +0200 |
|---|---|---|
| committer | Phil Sturgeon <email@philsturgeon.co.uk> | 2012-04-26 23:44:22 +0200 |
| commit | 6fb427d151ed18622b86453581cc22989715ddc3 (patch) | |
| tree | fa8f66d03745652c508029d0ca77537f37230dfc /system/core/Controller.php | |
| parent | 79ac3d1f6e21d199971471586df22011206f868a (diff) | |
| parent | f59bb1ac944dfaed23150ffd452ce5bca9f5f5c0 (diff) | |
Merge pull request #1266 from timw4mail/patch
Normalize comments in core files
Diffstat (limited to 'system/core/Controller.php')
| -rw-r--r-- | system/core/Controller.php | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/system/core/Controller.php b/system/core/Controller.php index 05e1bf5bf..1f69146d0 100644 --- a/system/core/Controller.php +++ b/system/core/Controller.php @@ -25,8 +25,6 @@ * @filesource */ -// ------------------------------------------------------------------------ - /** * CodeIgniter Application Controller Class * @@ -41,8 +39,16 @@ */ class CI_Controller { + /** + * Reference to the global CI instance + * + * @var object + */ private static $instance; + /** + * Set up controller properties and methods + */ public function __construct() { self::$instance =& $this; @@ -60,6 +66,11 @@ class CI_Controller { log_message('debug', 'Controller Class Initialized'); } + /** + * Return the CI object + * + * @return object + */ public static function &get_instance() { return self::$instance; @@ -67,4 +78,4 @@ class CI_Controller { } /* End of file Controller.php */ -/* Location: ./system/core/Controller.php */ +/* Location: ./system/core/Controller.php */
\ No newline at end of file |