From 051aa149b09cc326d7360b8820822782e2154c3a Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Mon, 1 Feb 2016 11:40:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E9=85=8D=E7=BD=AE=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C=E5=A6=82=E6=9E=9C?=
 =?UTF-8?q?=E6=9C=89=E4=BA=8C=E7=BB=B4=E9=85=8D=E7=BD=AE=E5=8F=82=E6=95=B0?=
 =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=20=E6=94=AF=E6=8C=81=E5=90=88?=
 =?UTF-8?q?=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/Config.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/library/think/Config.php b/library/think/Config.php
index 6d9dbf14..bd6e1083 100644
--- a/library/think/Config.php
+++ b/library/think/Config.php
@@ -142,10 +142,14 @@ class Config
             return;
         } elseif (is_array($name)) {
             // 批量设置
+            $config = array_change_key_case($name);
             if (!empty($value)) {
-                return self::$config[$range][$value] = array_change_key_case($name);
+                self::$config[$range][$value] = isset(self::$config[$range][$value]) ?
+                array_merge(self::$config[$range][$value], $config) :
+                self::$config[$range][$value] = $config;
+                return self::$config[$range][$value];
             } else {
-                return self::$config[$range] = array_merge(self::$config[$range], array_change_key_case($name));
+                return self::$config[$range] = array_merge(self::$config[$range], $config);
             }
         } else {
             // 为空直接返回 已有配置
@@ -158,7 +162,7 @@ class Config
      */
     public static function reset($range = '')
     {
-        $range = $range ?: self::$range;
+        $range                          = $range ?: self::$range;
         true === $range ? self::$config = [] : self::$config[$range] = [];
     }
 }