From d6daa4aca83e1f56135935e97b4046af00d168c9 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Mon, 4 Jul 2016 11:53:33 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9BRoute=E7=B1=BB=E7=9A=84rule?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=20=E5=90=88=E5=B9=B6=E5=88=86=E7=BB=84?=
 =?UTF-8?q?=E7=9A=84=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/library/think/Route.php b/library/think/Route.php
index 686e98cf..319dc8a5 100644
--- a/library/think/Route.php
+++ b/library/think/Route.php
@@ -218,7 +218,7 @@ class Route
     public static function rule($rule, $route = '', $type = '*', $option = [], $pattern = [], $group = '')
     {
         $group  = $group ?: self::$group;
-        $option = $option ?: self::$option;
+        $option = array_merge(self::$option, $option);
         $type   = strtoupper($type);
         if (strpos($type, '|')) {
             foreach (explode('|', $type) as $val) {