summaryrefslogtreecommitdiffstats
path: root/system/core
diff options
context:
space:
mode:
authorEric Roberts <eric@cryode.com>2013-01-12 04:21:25 +0100
committerEric Roberts <eric@cryode.com>2013-01-12 04:21:25 +0100
commit7a4fb63a43392fc1cf5a5ead32ad81451c53dc67 (patch)
tree9fb1452b99805eaf655b8760f18ece663c160783 /system/core
parentc90e67ea553f1ff0fc22f280583fca22f95f9f42 (diff)
parent5a519db2c4884a3972dd33e09d0b3a314aa222e2 (diff)
Merge branch 'develop' of https://github.com/EllisLab/CodeIgniter into feature/output-cache-improvements
Diffstat (limited to 'system/core')
-rw-r--r--system/core/Loader.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/system/core/Loader.php b/system/core/Loader.php
index 9bfddc15a..4d95d6288 100644
--- a/system/core/Loader.php
+++ b/system/core/Loader.php
@@ -233,9 +233,9 @@ class CI_Loader {
}
elseif (is_array($model))
{
- foreach ($model as $class)
+ foreach ($model as $key => $value)
{
- $this->model($class);
+ $this->model(is_int($key) ? $value : $key, $value);
}
return;
}