diff options
| author | Andrey Andreev <narf@bofh.bg> | 2012-06-07 20:56:59 +0200 |
|---|---|---|
| committer | Andrey Andreev <narf@bofh.bg> | 2012-06-07 20:56:59 +0200 |
| commit | cd221aba73cb7a117c70ca237f0ee9dc14f80cf1 (patch) | |
| tree | 39db53d645226c212eb697494320eef6302544a0 /system/core/Controller.php | |
| parent | 1fcce9667fe8d1925a36549e22124411f5828230 (diff) | |
| parent | 6c776538c4e8f1b932d5ec7431c1c8de8a5642a6 (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 */ |