diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-06-07 21:34:38 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-06-07 21:34:38 +0200 |
| commit | feec9db5e6514f242e17b4504536d746660fd02c (patch) | |
| tree | cec0ce356bd58892b9b3af50d14c2eb70c9b5b48 /system/core/Controller.php | |
| parent | bd738c80a623700b3b11e876abb764ca6d57769d (diff) | |
| parent | 25c08390bd93ba27d89a8682b37c8c6184a53c07 (diff) | |
Merge upstream branch
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 */ |