Merge branch 'master' of https://github.com/top-think/framework

top-think · Aug 28, 2017 · 64ccd7e · 64ccd7e
2 parents 6e75d3c + 9e86f28
commit 64ccd7e
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/library/think/Config.php b/library/think/Config.php
@@ -152,8 +152,7 @@ public static function set($name, $value = null, $range = '')
             // 批量设置
             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));