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; }