diff options
| author | Timothy Warren <tim@timshomepage.net> | 2012-05-17 14:02:21 +0200 |
|---|---|---|
| committer | Timothy Warren <tim@timshomepage.net> | 2012-05-17 14:02:21 +0200 |
| commit | e8e09039b49ac5883e9e94162579841375e13c69 (patch) | |
| tree | c206119bbc5bdcd573b56609b6450b14e6c20dcb /system/core/Controller.php | |
| parent | 43c216b998ccf8c8208b237e9e0d9c468c8a82e5 (diff) | |
| parent | ae31eb5e75d914fc3ab622a7ac5c23eb1e6d9f9a (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 */ |