| commit | b4473d4407311cc5e4b2306cf5fa51221d5826f8 | [log] [tgz] |
|---|---|---|
| author | admin <devnull@localhost> | Sun Aug 27 15:46:31 2006 +0000 |
| committer | admin <devnull@localhost> | Sun Aug 27 15:46:31 2006 +0000 |
| tree | 3f0a2d37fd48db2aedc64e6af348d66c858ab986 | |
| parent | 57b3d39cb79bb3b8d193e0e345a62e3396e519f2 [diff] |
diff --git a/system/libraries/Controller.php b/system/libraries/Controller.php index ec21f8d..06e54b2 100644 --- a/system/libraries/Controller.php +++ b/system/libraries/Controller.php
@@ -127,7 +127,12 @@ { $name = $model; } - + + if (in_array($name, $this->_ci_models)) + { + return; + } + if (isset($this->$name)) { show_error('The model name you are loading is the name of a resource that is already being used: '.$name);