From ab467b3b7ed133b2d7d4fc17f031d62352a3ce8c Mon Sep 17 00:00:00 2001 From: thinkphp Date: Thu, 31 Dec 2015 14:37:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E8=B7=AF=E7=94=B1=E9=A2=9D?= =?UTF-8?q?=E5=A4=96=E5=8F=82=E6=95=B0=E8=8E=B7=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- library/think/route.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/library/think/route.php b/library/think/route.php index 4bf7b327..cc7de467 100644 --- a/library/think/route.php +++ b/library/think/route.php @@ -600,7 +600,11 @@ class Route } // 解析路由自动传人参数 if (is_array($route) && isset($route[1])) { - parse_str($route[1], $params); + if (is_string($route[1])) { + parse_str($route[1], $params); + } else { + $params = $route[1]; + } $var = array_merge($var, $params); } $_GET = array_merge($var, $_GET); @@ -638,7 +642,11 @@ class Route } // 解析路由自动传人参数 if (is_array($route) && isset($route[1])) { - parse_str($route[1], $params); + if (is_string($route[1])) { + parse_str($route[1], $params); + } else { + $params = $route[1]; + } $var = array_merge($var, $params); } $_GET = array_merge($var, $_GET);