summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2017-11-03 12:38:13 +0100
committerAndrey Andreev <narf@devilix.net>2017-11-06 12:05:30 +0100
commit6cfc6a9c2a03207fdade86660e73aa4607b98f56 (patch)
treeca6083dcd7577eea0a70845500dbcd46e5ad74b2
parent211d23d31bd33d857377bdb13abdc104772164ff (diff)
[ci skip] Merge pull request #5321 from PrestigeT/documentation
Fixed docblock on model function. Changed @param model from string to mixed
-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 085c5b51d..fe2d43717 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