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

注释调整

Browse Source
This commit is contained in:
thinkphp
2016-06-16 13:48:40 +08:00
parent 4d6ae0fcb6
commit d8fc0bf7aa
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
library/think/Request.php
View File

@@ -177,14 +177,14 @@ class Request
if (isset($info['query'])) { if (isset($info['query'])) {
parse_str(html_entity_decode($info['query']), $query); parse_str(html_entity_decode($info['query']), $query);
if (!empty($params)) { if (!empty($params)) {
$params = array_replace($query, $params); $params = array_replace($query, $params);
$queryString = http_build_query($query, '', '&'); $queryString = http_build_query($query, '', '&');
} else { } else {
$params = $query; $params = $query;
$queryString = $info['query']; $queryString = $info['query'];
} }
} elseif (!empty($params)) { } elseif (!empty($params)) {
$queryString = http_build_query($params, '', '&'); $queryString = http_build_query($params, '', '&');
} }
$server['REQUEST_URI'] = $info['path'] . ('' !== $queryString ? '?' . $queryString : ''); $server['REQUEST_URI'] = $info['path'] . ('' !== $queryString ? '?' . $queryString : '');
$server['QUERY_STRING'] = $queryString; $server['QUERY_STRING'] = $queryString;
@@ -546,9 +546,9 @@ class Request
} }
/** /**
* 当前请求的参数 * 设置获取获取当前请求的参数
* @access public * @access public
* @param string $name 变量名 * @param string|array $name 变量名
* @param mixed $default 默认值 * @param mixed $default 默认值
* @return mixed * @return mixed
*/ */

2
library/think/Route.php
View File

@@ -1197,7 +1197,7 @@ class Route
} }
// 设置当前请求的参数 // 设置当前请求的参数
Request::instance()->param(array_merge($var, $_GET)); Request::instance()->param(array_merge($var, $_GET));
} }
} }