From c7739d464e742acdc3c867deb44e62f2acfeb67e Mon Sep 17 00:00:00 2001
From: pwf0112 <pwf0112@163.com>
Date: Fri, 18 Dec 2015 23:32:07 +0800
Subject: [PATCH] Update loader.php

---
 library/think/loader.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/library/think/loader.php b/library/think/loader.php
index a9edc1b7..f2d15607 100644
--- a/library/think/loader.php
+++ b/library/think/loader.php
@@ -254,15 +254,17 @@ class Loader
             $module = MODULE_NAME;
         }
         $class = $module . '\\' . $layer . '\\' . self::parseName(str_replace('/', '\\', $name), 1);
+        $name = (false !== strpos($name, '/')) ? substr($name, strrpos($name, '/')+1) : $name;
         if (class_exists($class)) {
             $model = new $class($name);
-        } elseif (false === strpos($name, '/')) {
-            // 自动加载公共模块下面的模型
-            $class = COMMON_MODULE . strstr($class, '\\');
-            $model = class_exists($class) ? new $class($name) : new Model($name);
         } else {
-            Log::record('实例化不存在的类：' . $class, 'NOTIC');
-            $model = new Model($name);
+            $class = COMMON_MODULE . strstr($class, '\\');
+            if (class_exists($class)) {
+                $model = new $class($name);
+            } else {
+                Log::record('实例化不存在的类：' . $class, 'NOTIC');
+                $model = new Model($name);
+            }
         }
         $_model[$name . $layer] = $model;
         return $model;