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:52:26 +0100
commit1c6a3f4356856899f012c6dc1ae81a21c35016e0 (patch)
tree9f295326b429e2b8d8357619566eeafd7196a811 /system
parenta6fbedce98e92caaa20c24461587cecad6a37214 (diff)
parenta479ae85f21caef9d109b2e75229853e0b660cce (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 84f224123..d9ac7efe3 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()
{