summaryrefslogtreecommitdiffstats
path: root/system/core
diff options
context:
space:
mode:
authorAhmad Anbar <aanbar@gmail.com>2013-09-12 22:33:28 +0200
committerAhmad Anbar <aanbar@gmail.com>2013-09-12 22:33:28 +0200
commit4005e3c06e362f90dde1dff1564bd91adca52e9f (patch)
tree213f29ff2f9b3d9e61c930de12cabb178a184483 /system/core
parent9b34448a295cac42273439e7cadb284bd3fe1a4d (diff)
Fixed issue #2638 which prevented loading models in sub-folders by passing an array.
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 1709c2db1..a218e79fb 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;
}
@@ -1293,4 +1293,4 @@ class CI_Loader {
}
/* End of file Loader.php */
-/* Location: ./system/core/Loader.php */ \ No newline at end of file
+/* Location: ./system/core/Loader.php */