From 46c500db8fe4e49256bddaf2eeedf481f5433116 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Thu, 16 Jun 2016 17:21:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E8=B7=AF=E7=94=B1=E5=88=86?=
 =?UTF-8?q?=E7=BB=84=E7=9A=84=E5=8F=82=E6=95=B0=E8=A6=86=E7=9B=96=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
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 1912f470..081cce87 100644
--- a/library/think/Route.php
+++ b/library/think/Route.php
@@ -211,7 +211,7 @@ class Route
     public static function rule($rule, $route = '', $type = '*', $option = [], $pattern = [], $group = '')
     {
         $group  = $group ?: self::$group;
-        $option = $option ?: self::$option;
+        $option = $option ? array_merge(self::$option, $option) : self::$option;
 
         $type = strtoupper($type);
         if (strpos($type, '|')) {