From 35be8261959cfece1cb4163c54d5ff4763e8ad70 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Mon, 1 Feb 2016 09:41:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9BRoute=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/library/think/Route.php b/library/think/Route.php
index 269c0a89..8984025f 100644
--- a/library/think/Route.php
+++ b/library/think/Route.php
@@ -392,8 +392,9 @@ class Route
                             }
                             $pattern = array_merge($pattern, isset($route[2]) ? $route[2] : []);
                             $route   = $route[0];
+                            $option  = array_merge($option, $option1);
                         }
-                        $result = self::checkRule($key, $route, $url1, $pattern, $option1);
+                        $result = self::checkRule($key, $route, $url1, $pattern, $option);
                         if (false !== $result) {
                             return $result;
                         }