diff options
| author | Timothy Warren <tim@timshomepage.net> | 2012-05-17 14:55:08 +0200 |
|---|---|---|
| committer | Timothy Warren <tim@timshomepage.net> | 2012-05-17 14:55:08 +0200 |
| commit | 55450deee2acbdf112f5c206673b3215ca10dfcb (patch) | |
| tree | 09fa0f810524ed353f868194059f336c6f26eb50 /system/core/Controller.php | |
| parent | 351c2e1b0d3fdca80a5483d708d7c71084226e68 (diff) | |
| parent | e30b3f7afafa2c016cf78cc8bb8a457c2dbcda8c (diff) | |
merge upstream
Diffstat (limited to 'system/core/Controller.php')
| -rw-r--r-- | system/core/Controller.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/system/core/Controller.php b/system/core/Controller.php index 1f69146d0..491414807 100644 --- a/system/core/Controller.php +++ b/system/core/Controller.php @@ -48,6 +48,8 @@ class CI_Controller { /** * Set up controller properties and methods + * + * @return void */ public function __construct() { @@ -67,14 +69,15 @@ class CI_Controller { } /** - * Return the CI object + * Return the CI object * - * @return object + * @return object */ public static function &get_instance() { return self::$instance; } + } /* End of file Controller.php */ |