summaryrefslogtreecommitdiffstats
path: root/system/libraries/Loader.php
diff options
context:
space:
mode:
authoradmin <devnull@localhost>2006-10-12 01:48:41 +0200
committeradmin <devnull@localhost>2006-10-12 01:48:41 +0200
commit606f99c043272f96f21911d89c21cd36c2ef59e4 (patch)
tree4f73881300630f26dbc2940a11177aceabc82878 /system/libraries/Loader.php
parent4c1ab6c826c3f5c3158a38443c2d3c30203f0f5a (diff)
Diffstat (limited to 'system/libraries/Loader.php')
-rw-r--r--system/libraries/Loader.php11
1 files changed, 3 insertions, 8 deletions
diff --git a/system/libraries/Loader.php b/system/libraries/Loader.php
index 96ec0c919..7a6637ac0 100644
--- a/system/libraries/Loader.php
+++ b/system/libraries/Loader.php
@@ -171,10 +171,7 @@ class CI_Loader {
$CI->$name = new $model();
foreach (get_object_vars($CI) as $key => $var)
{
- if ( ! isset($CI->$name->$key))
- {
- $CI->$name->$key =& $CI->$key;
- }
+ $CI->$name->$key =& $CI->$key;
}
}
else
@@ -182,14 +179,12 @@ class CI_Loader {
$this->$name = new $model();
foreach (get_object_vars($this) as $key => $var)
{
- if ( ! isset($this->$name->$key))
- {
- $this->$name->$key =& $CI->$key;
- }
+ $this->$name->$key =& $this->$key;
}
}
$this->_ci_models[] = $name;
+ $this->_ci_assign_to_models();
}