summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2017-11-03 12:38:13 +0100
committerGitHub <noreply@github.com>2017-11-03 12:38:13 +0100
commite56a28d0698cb9743995fdac664336047101fe34 (patch)
treeb84c5fd1cc3c66f81a0b98be4b781f23905637e1 /system
parent8300332104d9f97bc7c0a0c51acb1221bf467a06 (diff)
parent151dd609313dcc2b52d2a7681f2722d388780b53 (diff)
[ci skip] Merge pull request #5321 from PrestigeT/documentation
Fixed docblock on model function. Changed @param model from string to mixed
Diffstat (limited to 'system')
-rw-r--r--system/core/Loader.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/system/core/Loader.php b/system/core/Loader.php
index 580145231..fd43ebbe1 100644
--- a/system/core/Loader.php
+++ b/system/core/Loader.php
@@ -226,7 +226,7 @@ class CI_Loader {
*
* Loads and instantiates models.
*
- * @param string $model Model name
+ * @param mixed $model Model name
* @param string $name An optional object name to assign to
* @param bool $db_conn An optional database connection configuration to initialize
* @return object