mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-01 20:52:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

改进Request类param方法的优先获取顺序 路由变量优先 路由规则中的额外参数纳入 路由变量

Browse Source
This commit is contained in:
thinkphp
2016-08-22 18:11:51 +08:00
parent 6e81323487
commit 107f77474e
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
library/think/Request.php
View File

@@ -617,7 +617,7 @@ class Request
$vars = [];
}
// 当前请求参数和URL地址中的参数合并
$this->param = array_merge($this->route(false), $this->get(false), $vars);
$this->param = array_merge($this->get(false), $vars, $this->route(false));
}
if (true === $name) {
// 获取包含文件上传信息的数组