summaryrefslogtreecommitdiffstats
path: root/system
diff options
context:
space:
mode:
authoradmin <devnull@localhost>2006-08-27 17:46:31 +0200
committeradmin <devnull@localhost>2006-08-27 17:46:31 +0200
commitb4473d4407311cc5e4b2306cf5fa51221d5826f8 (patch)
tree3f0a2d37fd48db2aedc64e6af348d66c858ab986 /system
parent57b3d39cb79bb3b8d193e0e345a62e3396e519f2 (diff)
Diffstat (limited to 'system')
-rw-r--r--system/libraries/Controller.php7
1 files changed, 6 insertions, 1 deletions
diff --git a/system/libraries/Controller.php b/system/libraries/Controller.php
index ec21f8d66..06e54b2d1 100644
--- a/system/libraries/Controller.php
+++ b/system/libraries/Controller.php
@@ -127,7 +127,12 @@ class Controller extends CI_Base {
{
$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);