Always check whether a model be a subclass of CI_Model when loaded.

Signed-off-by: tianhe1986 <w1s2j3229@163.com>

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;