From 107f272eb3f4794118f6a1a478759933ed363ab1 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Sun, 9 Oct 2016 21:10:56 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9BLang=E7=B1=BBload=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/Lang.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/library/think/Lang.php b/library/think/Lang.php
index 16e7f545..e064ae45 100644
--- a/library/think/Lang.php
+++ b/library/think/Lang.php
@@ -83,7 +83,9 @@ class Lang
                 // 记录加载信息
                 App::$debug && Log::record('[ LANG ] ' . $_file, 'info');
                 $_lang = include $_file;
-                $lang  = array_change_key_case($_lang) + $lang;
+                if (is_array($_lang)) {
+                    $lang = array_change_key_case($_lang) + $lang;
+                }
             }
         }
         if (!empty($lang)) {