From d95ef85e8685ab9d31d1fdd0ff435104dc573fa3 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Tue, 21 Jun 2016 17:33:58 +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 | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/library/think/Loader.php b/library/think/Loader.php
index 7926770a..546ae937 100644
--- a/library/think/Loader.php
+++ b/library/think/Loader.php
@@ -150,22 +150,22 @@ class Loader
                         include $file;
                     }
                 }
-            } else {
-                self::scanComposerPackage();
+            } elseif (is_dir(VENDOR_PATH)) {
+                self::scanComposerPackage(VENDOR_PATH);
             }
         }
     }
 
     // 扫描composer package
-    private static function scanComposerPackage()
+    private static function scanComposerPackage($path)
     {
         // 自动扫描下载Composer安装类库
-        $dirs      = scandir(VENDOR_PATH, 1);
+        $dirs      = scandir($path, 1);
         $namespace = [];
         foreach ($dirs as $dir) {
-            if ('.' != $dir && '..' != $dir && is_file(VENDOR_PATH . $dir . DS . 'composer.json')) {
+            if ('.' != $dir && '..' != $dir && is_file($path . $dir . DS . 'composer.json')) {
                 // 解析 package的composer.json 文件
-                $namespace = array_merge($namespace, self::parseComposerPackage(VENDOR_PATH . $dir . DS));
+                $namespace = array_merge($namespace, self::parseComposerPackage($path . $dir . DS));
             }
         }
         if (!empty($namespace)) {