From 27bd97691645a57ed0131dffd6c93d3d38afb721 Mon Sep 17 00:00:00 2001 From: thinkphp Date: Wed, 8 Jun 2016 13:53:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3Route=E7=B1=BB=E7=9A=84parseU?= =?UTF-8?q?rlParams=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- library/think/App.php | 2 +- library/think/Route.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/library/think/App.php b/library/think/App.php index 32dcb426..e7deb066 100644 --- a/library/think/App.php +++ b/library/think/App.php @@ -273,7 +273,7 @@ class App try { $instance = Loader::controller($controller, $config['url_controller_layer'], $config['use_controller_suffix'], $config['empty_controller']); - + // 获取当前操作名 $action = $actionName . $config['action_suffix']; if (!preg_match('/^[A-Za-z](\w)*$/', $action)) { diff --git a/library/think/Route.php b/library/think/Route.php index bd36215b..53cefe43 100644 --- a/library/think/Route.php +++ b/library/think/Route.php @@ -1068,7 +1068,7 @@ class Route * @param array $var 变量 * @return void */ - private static function parseUrlParams($url, $var) + private static function parseUrlParams($url, $var = []) { if ($url) { if (Config::get('url_param_type')) {