From f671c1ad41167cf558a349f6d566b09681145820 Mon Sep 17 00:00:00 2001
From: yunwuxin <448901948@qq.com>
Date: Mon, 11 Jul 2016 14:30:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E8=B7=AF=E7=94=B1?=
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 b8894d86..5e0ac272 100644
--- a/library/think/Route.php
+++ b/library/think/Route.php
@@ -754,7 +754,7 @@ class Route
         }
         if (isset($miss)) {
             // 未匹配所有路由的路由规则处理
-            return self::parseRule('', $miss, $url);
+            return self::parseRule('', $miss['route'], $url);
         }
         return false;
     }
@@ -1162,7 +1162,7 @@ class Route
             $paths = explode('/', $pathinfo);
         }
         // 获取路由地址规则
-        $url = is_array($route) ? $route[0] : $route;
+        $url = $route;
         // 替换路由地址中的变量
         if (is_string($url) && !empty($matches)) {
             foreach ($matches as $key => $val) {
@@ -1177,7 +1177,7 @@ class Route
             $result = ['type' => 'function', 'function' => $url, 'params' => $matches];
         } elseif (0 === strpos($url, '/') || 0 === strpos($url, 'http')) {
             // 路由到重定向地址
-            $result = ['type' => 'redirect', 'url' => $url, 'status' => (is_array($route) && isset($route[1])) ? $route[1] : 301];
+            $result = ['type' => 'redirect', 'url' => $url, 'status' => isset($option['status']) ? $option['status'] : 301];
         } elseif (0 === strpos($url, '\\')) {
             // 路由到方法
             $method = strpos($url, '@') ? explode('@', $url) : $url;