mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-08-30 12:45:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

改进Request的param方法和Route类的parseUrlParams方法

Browse Source
This commit is contained in:
thinkphp
2016-06-16 13:39:55 +08:00
parent 3fd9f0bc13
commit a7df3d52e2
2 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
library/think/Request.php
View File

@@ -173,23 +173,23 @@ class Request
$info['path'] = '/';
}
$options = [];
$options['param'] = $params;
$queryString = '';
if (isset($info['query'])) {
parse_str(html_entity_decode($info['query']), $query);
if (!empty($options['param'])) {
$options['param'] = array_replace($query, $options['param']);
if (!empty($params)) {
$params = array_replace($query, $params);
$queryString = http_build_query($query, '', '&');
} else {
$options['param'] = $query;
$params = $query;
$queryString = $info['query'];
}
} elseif (isset($options['param'])) {
$queryString = http_build_query($options['param'], '', '&');
} elseif (!empty($params)) {
$queryString = http_build_query($params, '', '&');
}
$server['REQUEST_URI'] = $info['path'] . ('' !== $queryString ? '?' . $queryString : '');
$server['QUERY_STRING'] = $queryString;
$options['cookie'] = $cookie;
$options['param'] = $params;
$options['file'] = $files;
$options['server'] = $server;
$options['url'] = $server['REQUEST_URI'];
@@ -554,6 +554,11 @@ class Request
*/
public function param($name = '', $default = null)
{
if(is_array($name)){
// 设置param
$this->param = array_merge($this->param, $name);
return;
}
if (empty($this->param)) {
$method = $this->method(true);
// 自动获取请求变量