From 983b3afe49d170377aa168700828d7cccfc8dfba Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Fri, 20 Oct 2017 11:28:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/library/think/Loader.php b/library/think/Loader.php
index 23e546d7..b4f39bf5 100644
--- a/library/think/Loader.php
+++ b/library/think/Loader.php
@@ -369,7 +369,7 @@ class Loader
         if (isset(self::$instance[$guid])) {
             return self::$instance[$guid];
         }
-        list($module, $class) = $this->getModuleAndClass($name, $layer, $appendSuffix);
+        list($module, $class) = self::getModuleAndClass($name, $layer, $appendSuffix);
         if (class_exists($class)) {
             $model = new $class();
         } else {
@@ -395,7 +395,7 @@ class Loader
      */
     public static function controller($name, $layer = 'controller', $appendSuffix = false, $empty = '')
     {
-        list($module, $class) = $this->getModuleAndClass($name, $layer, $appendSuffix);
+        list($module, $class) = self::getModuleAndClass($name, $layer, $appendSuffix);
         if (class_exists($class)) {
             return App::invokeClass($class);
         } elseif ($empty && class_exists($emptyClass = self::parseClass($module, $layer, $empty, $appendSuffix))) {
@@ -424,7 +424,7 @@ class Loader
         if (isset(self::$instance[$guid])) {
             return self::$instance[$guid];
         }
-        list($module, $class) = $this->getModuleAndClass($name, $layer, $appendSuffix);
+        list($module, $class) = self::getModuleAndClass($name, $layer, $appendSuffix);
         if (class_exists($class)) {
             $validate = new $class;
         } else {
@@ -446,7 +446,7 @@ class Loader
      * @param bool   $appendSuffix 是否添加类名后缀
      * @return array
      */
-    protected function getModuleAndClass($name, $layer, $appendSuffix)
+    protected static function getModuleAndClass($name, $layer, $appendSuffix)
     {
         if (false !== strpos($name, '\\')) {
             $module = Request::instance()->module();