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/CodeIgniter.php | |
| parent | 79ac3d1f6e21d199971471586df22011206f868a (diff) | |
| parent | f59bb1ac944dfaed23150ffd452ce5bca9f5f5c0 (diff) | |
Merge pull request #1266 from timw4mail/patch
Normalize comments in core files
Diffstat (limited to 'system/core/CodeIgniter.php')
| -rwxr-xr-x | system/core/CodeIgniter.php | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php index 92187fa16..793c4687e 100755 --- a/system/core/CodeIgniter.php +++ b/system/core/CodeIgniter.php @@ -25,8 +25,6 @@ * @filesource */ -// ------------------------------------------------------------------------ - /** * System Initialization File * @@ -42,7 +40,7 @@ /** * CodeIgniter Version * - * @var string + * @var string * */ define('CI_VERSION', '3.0-dev'); @@ -230,6 +228,13 @@ // Load the base controller class require BASEPATH.'core/Controller.php'; + /** + * Reference to the CI_Controller method. + * + * Returns current CI instance object + * + * @return object + */ function &get_instance() { return CI_Controller::get_instance(); |