From d9be9ddf6fd7228862967b03de1f7c038be7ca4f Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Mon, 17 Oct 2016 13:53:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9BLoader=E7=B1=BBmodel=E5=92=8C?=
 =?UTF-8?q?validate=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/Loader.php | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/library/think/Loader.php b/library/think/Loader.php
index cfa0a217..9f54ad3a 100644
--- a/library/think/Loader.php
+++ b/library/think/Loader.php
@@ -365,8 +365,9 @@ class Loader
      */
     public static function model($name = '', $layer = 'model', $appendSuffix = false, $common = 'common')
     {
-        if (isset(self::$instance[$name . $layer])) {
-            return self::$instance[$name . $layer];
+        $guid = $name . $layer;
+        if (isset(self::$instance[$guid])) {
+            return self::$instance[$guid];
         }
         if (strpos($name, '/')) {
             list($module, $name) = explode('/', $name, 2);
@@ -384,7 +385,7 @@ class Loader
                 throw new ClassNotFoundException('class not exists:' . $class, $class);
             }
         }
-        self::$instance[$name . $layer] = $model;
+        self::$instance[$guid] = $model;
         return $model;
     }
 
@@ -427,9 +428,9 @@ class Loader
         if (empty($name)) {
             return new Validate;
         }
-
-        if (isset(self::$instance[$name . $layer])) {
-            return self::$instance[$name . $layer];
+        $guid = $name . $layer;
+        if (isset(self::$instance[$guid])) {
+            return self::$instance[$guid];
         }
         if (strpos($name, '/')) {
             list($module, $name) = explode('/', $name);
@@ -447,7 +448,7 @@ class Loader
                 throw new ClassNotFoundException('class not exists:' . $class, $class);
             }
         }
-        self::$instance[$name . $layer] = $validate;
+        self::$instance[$guid] = $validate;
         return $validate;
     }