From aa9ce71cda644b0240c5d932a77cffc94afcb111 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Thu, 24 Aug 2017 22:33:14 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/Config.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/library/think/Config.php b/library/think/Config.php
index f0b4bd4f..1fa5d4af 100644
--- a/library/think/Config.php
+++ b/library/think/Config.php
@@ -152,8 +152,7 @@ class Config
             // 批量设置
             if (!empty($value)) {
                 self::$config[$range][$value] = isset(self::$config[$range][$value]) ?
-                array_merge(self::$config[$range][$value], $name) :
-                self::$config[$range][$value] = $name;
+                array_merge(self::$config[$range][$value], $name) : $name;
                 return self::$config[$range][$value];
             } else {
                 return self::$config[$range] = array_merge(self::$config[$range], array_change_key_case($name));