From 84fa46f9f3ba4e72c7a078520a0fbd38de949fef Mon Sep 17 00:00:00 2001
From: huangdijia <huangdijia@gmail.com>
Date: Thu, 7 Jan 2016 10:45:23 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=95=B0=E5=AD=97=E5=AD=90?=
 =?UTF-8?q?=E5=9F=9F=E5=90=8D=E4=B8=8D=E8=83=BD=E6=AD=A3=E5=B8=B8=E8=A7=A3?=
 =?UTF-8?q?=E6=9E=90=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=8C=E5=A6=82:=20'110'?=
 =?UTF-8?q?=3D>'index/Safe'?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/library/think/Route.php b/library/think/Route.php
index 4eedb2ad..ed4eee2b 100644
--- a/library/think/Route.php
+++ b/library/think/Route.php
@@ -61,7 +61,9 @@ class Route
     private static function setting($var, $name = '', $value = '')
     {
         if (is_array($name)) {
-            self::${$var} = array_merge(self::${$var}, $name);
+            foreach ($name as $key => $value) {
+                self::${$var}[$key] = $value;
+            }
         } elseif (empty($name)) {
             return self::${$var};
         } else {