1、内核更新

2、bug修复
2016-07-14 15:50:24 +08:00
parent 4b72704c77
commit 7ece5519ae
12 changed files with 204 additions and 182 deletions
@@ -443,7 +443,9 @@ class Route
                    || (isset($option['except']) && in_array($key, $option['except']))) {
                    continue;
                }
-                if (strpos($val[1], ':id') && isset($option['var'][$rule])) {
+                if (isset($last) && strpos($val[1], ':id') && isset($option['var'][$last])) {
+                    $val[1] = str_replace(':id', ':' . $option['var'][$last], $val[1]);
+                } elseif (strpos($val[1], ':id') && isset($option['var'][$rule])) {
                    $val[1] = str_replace(':id', ':' . $option['var'][$rule], $val[1]);
                }
                $item = ltrim($rule . $val[1], '/');