改进路由规则定义的变量获取

2026-07-01 20:52:48 +08:00 · 2016-03-25 17:03:30 +08:00
parent f85a2bfe98
commit 0ad3e4587a
1 changed files with 10 additions and 2 deletions
--- a/library/think/Route.php
+++ b/library/think/Route.php
@@ -609,10 +609,18 @@ class Route
                        $val = str_replace('<' . $name . '>', '(' . $pattern[$name] . ')', $val);
                    }
                }
-                if (!preg_match('/^' . $val . '$/', $m1[$key])) {
+                if (preg_match('/^' . $val . '$/', $m1[$key], $match)) {
+                    array_shift($match);
+                    foreach ($matches[1] as $i => $name) {
+                        if (strpos($name, '?')) {
+                            $name = substr($name, 0, -1);
+                        }
+                        $var[$name] = $match[$i];
+                    }
+                    continue;
+                } else {
                    return false;
                }
-                continue;
            }

            if (0 === strpos($val, '[:')) {