From fa8aac7c13ec3fb1e0f71a37eced5a1388d8e432 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Thu, 26 May 2016 22:38:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3Route=E7=B1=BB?=
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 8e2370e9..5d3badce 100644
--- a/library/think/Route.php
+++ b/library/think/Route.php
@@ -936,7 +936,7 @@ class Route
     private static function match($url, $rule, $pattern, $merge)
     {
         $m2 = explode('/', $rule);
-        $m1 = explode('/', $url, $merge ? count($m2) : null);
+        $m1 = $merge ? explode('/', $url, count($m2)) : explode('/', $url);
 
         $var = [];
         foreach ($m2 as $key => $val) {
@@ -993,12 +993,12 @@ class Route
      * @param bool $merge 合并额外变量
      * @return array
      */
-    private static function parseRule($rule, $route, $pathinfo, $matches, $merge)
+    private static function parseRule($rule, $route, $pathinfo, $matches, $merge = false)
     {
         // 解析路由规则
         $rule = explode('/', $rule);
         // 获取URL地址中的参数
-        $paths = explode('/', $pathinfo, $merge ? count($rule) : null);
+        $paths = $merge ? explode('/', $pathinfo, count($rule)) : explode('/', $pathinfo);
         // 获取路由地址规则
         $url = is_array($route) ? $route[0] : $route;