summaryrefslogtreecommitdiffstats
path: root/system/core
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2013-09-13 14:30:31 +0200
committerAndrey Andreev <narf@devilix.net>2013-09-13 14:30:31 +0200
commit79d9e38f4c240098199c12a64d18457e7c1daef7 (patch)
tree75ed2d99f52989f7dd23b5efdce55fd80b70b9f0 /system/core
parent3c5ec85c6a6303dfed8cefbbb77f5ce7571967bb (diff)
parented3fd58f97c496d40357ab931fd2d8cdb821a0a8 (diff)
Merge pull request #2641 from aanbar/develop
Fixed issue #2638
Diffstat (limited to 'system/core')
-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 1709c2db1..2eef9979c 100644
--- a/system/core/Loader.php
+++ b/system/core/Loader.php
@@ -222,7 +222,7 @@ class CI_Loader {
{
foreach ($model as $key => $value)
{
- $this->model(is_int($key) ? $value : $key, $value);
+ is_int($key) ? $this->model($value, '', $db_conn) : $this->model($key, $value, $db_conn);
}
return;
}