From 5bbc0e423dfc0bcd561da455f30995802534ab47 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Thu, 3 Mar 2016 23:17:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9BLoader=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/library/think/Loader.php b/library/think/Loader.php
index 2b8fb202..32faf2df 100644
--- a/library/think/Loader.php
+++ b/library/think/Loader.php
@@ -20,7 +20,7 @@ class Loader
     // 命名空间
     protected static $namespace = [];
     // 命名空间别名
-    protected static $namespaceAlias  = [];
+    protected static $namespaceAlias = [];
     // PSR-4
     private static $prefixLengthsPsr4 = [];
     private static $prefixDirsPsr4    = [];
@@ -31,13 +31,13 @@ class Loader
     public static function autoload($class)
     {
         // 检测命名空间别名
-        $ns = dirname($class);
-        $cn = basename($class);
-        if (isset(self::$namespaceAlias[$ns])) {
-            $original = self::$namespaceAlias[$ns].'\\'.$cn;
-            if (class_exists($original)) {
-                class_alias($original, $class);
-                return true;
+        if (!empty(self::$namespaceAlias)) {
+            $namespace = dirname($class);
+            if (isset(self::$namespaceAlias[$namespace])) {
+                $original = self::$namespaceAlias[$namespace] . '\\' . basename($class);
+                if (class_exists($original)) {
+                    return class_alias($original, $class, false);
+                }
             }
         }
         // 检查是否定义类库映射