mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-06 15:02:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

改进

Browse Source
This commit is contained in:
thinkphp
2016-07-22 12:51:27 +08:00
parent 7273f78b27
commit 7efe88f0c9
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
library/think/Route.php
View File

@@ -1114,11 +1114,13 @@ class Route
// 可选参数 // 可选参数
$val = substr($val, 1, -1); $val = substr($val, 1, -1);
$optional = true; $optional = true;
} else {
$optional = false;
} }
if (0 === strpos($val, ':')) { if (0 === strpos($val, ':')) {
// URL变量 // URL变量
$name = substr($val, 1); $name = substr($val, 1);
if (!isset($optional) && !isset($m1[$key])) { if (!$optional && !isset($m1[$key])) {
return false; return false;
} }
if (isset($m1[$key]) && isset($pattern[$name]) && !preg_match('/^' . $pattern[$name] . '$/', $m1[$key])) { if (isset($m1[$key]) && isset($pattern[$name]) && !preg_match('/^' . $pattern[$name] . '$/', $m1[$key])) {