From 6e23eb2b444037ce9aa9dde2bf9346f0e76b37c1 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Tue, 2 Aug 2016 10:23:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9B=E8=B7=AF=E7=94=B1=E5=88=86?=
 =?UTF-8?q?=E7=BB=84=E7=9A=84=E5=8F=82=E6=95=B0=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/library/think/Route.php b/library/think/Route.php
index 5d13fd2d..676b3fbf 100644
--- a/library/think/Route.php
+++ b/library/think/Route.php
@@ -345,7 +345,7 @@ class Route
             if ($routes instanceof \Closure) {
                 $currentOption  = self::getGroup('option');
                 $currentPattern = self::getGroup('pattern');
-                self::setGroup($name, $option, $pattern);
+                self::setGroup($name, array_merge($currentOption, $option), array_merge($currentPattern, $pattern));
                 call_user_func_array($routes, []);
                 self::setGroup($currentGroup, $currentOption, $currentPattern);
                 if ($currentGroup != $name) {
@@ -362,7 +362,7 @@ class Route
                     }
                     if (is_array($val)) {
                         $route    = $val[0];
-                        $option1  = array_merge($option, $val[1]);
+                        $option1  = array_merge($option, isset($val[1]) ? $val[1] : []);
                         $pattern1 = array_merge($pattern, isset($val[2]) ? $val[2] : []);
                     } else {
                         $route = $val;
@@ -385,7 +385,7 @@ class Route
             // 闭包注册
             $currentOption  = self::getGroup('option');
             $currentPattern = self::getGroup('pattern');
-            self::setGroup('', $option, $pattern);
+            self::setGroup('', array_merge($currentOption, $option), array_merge($currentPattern, $pattern));
             call_user_func_array($routes, []);
             self::setGroup($currentGroup, $currentOption, $currentPattern);
         } else {