summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2016-03-07 16:52:26 +0100
committerAndrey Andreev <narf@devilix.net>2016-03-07 16:53:09 +0100
commit7e0bde27c8a6669b781d87c15ea51b750c91f97c (patch)
treebe5f4bf83dbc489e85738b1399868c01c014c905 /system
parent1b7840b58c0705cc8a78c164940a114fa0012fae (diff)
Merge pull request #4472 from vibbow/patch-1
[ci skip] Update get_instance() return type in docblock
Diffstat (limited to 'system')
-rw-r--r--system/core/CodeIgniter.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php
index 52b542654..bf41ab2a2 100644
--- a/system/core/CodeIgniter.php
+++ b/system/core/CodeIgniter.php
@@ -359,7 +359,7 @@ if ( ! is_php('5.4'))
*
* Returns current CI instance object
*
- * @return object
+ * @return CI_Controller
*/
function &get_instance()
{