summaryrefslogtreecommitdiffstats
path: root/system/core/Loader.php
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2017-06-21 13:44:44 +0200
committerGitHub <noreply@github.com>2017-06-21 13:44:44 +0200
commitdb29eb3b290a67e92e67372bd1d772df431c607b (patch)
treece212ef3f762e420def85c5f00751695e22f6b73 /system/core/Loader.php
parent8186b6b398c26c0c1e0052eaddf4fc122e4929a5 (diff)
parentc8a0d0bc784a778694e7f42243a1584b51cf207d (diff)
Merge pull request #5159 from tianhe1986/develop_model_load
Always check a model be a subclass of CI_Model when loaded
Diffstat (limited to 'system/core/Loader.php')
-rw-r--r--system/core/Loader.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/system/core/Loader.php b/system/core/Loader.php
index 7279e8833..e6585ad3f 100644
--- a/system/core/Loader.php
+++ b/system/core/Loader.php
@@ -344,9 +344,10 @@ class CI_Loader {
throw new RuntimeException('Unable to locate the model you have specified: '.$model);
}
}
- elseif ( ! is_subclass_of($model, 'CI_Model'))
+
+ if ( ! is_subclass_of($model, 'CI_Model'))
{
- throw new RuntimeException("Class ".$model." already exists and doesn't extend CI_Model");
+ throw new RuntimeException("Class ".$model." doesn't extend CI_Model");
}
$this->_ci_models[] = $name;