From 394d85a505a26a2107ec35e796e7ea701aeaf431 Mon Sep 17 00:00:00 2001 From: thinkphp Date: Sun, 20 Dec 2015 11:02:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3lang=E7=B1=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- library/think/lang.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/library/think/lang.php b/library/think/lang.php index 1ba7c7b7..8df2e28c 100644 --- a/library/think/lang.php +++ b/library/think/lang.php @@ -64,14 +64,14 @@ class Lang self::$lang[$range] = []; } // 批量定义 -+ if (is_string($file)) { -+ $file = [$file]; -+ } -+ $lang = []; -+ foreach ($file as $_file) { -+ $_lang = is_file($_file) ? include $_file : []; -+ $lang = array_merge($lang, array_change_key_case($_lang)); - } + if (is_string($file)) { + $file = [$file]; + } + $lang = []; + foreach ($file as $_file) { + $_lang = is_file($_file) ? include $_file : []; + $lang = array_merge($lang, array_change_key_case($_lang)); + } if (!empty($lang)) { self::$lang[$range] = array_merge(self::$lang[$range], $lang); }