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

改进Request类 在赋值 get post put route方法的时候 清空param变量，并且取消 param方法的赋值功能

Browse Source
This commit is contained in:
thinkphp
2016-08-12 17:36:55 +08:00
parent 895888bb15
commit 699f268232
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
library/think/Request.php
View File

@@ -599,11 +599,6 @@ class Request
*/ */
public function param($name = '', $default = null, $filter = null) public function param($name = '', $default = null, $filter = null)
{ {
if (is_array($name)) {
// 设置param
$this->param = array_merge($this->param, $name);
return;
}
if (empty($this->param)) { if (empty($this->param)) {
$method = $this->method(true); $method = $this->method(true);
// 自动获取请求变量 // 自动获取请求变量
@@ -642,6 +637,7 @@ class Request
public function route($name = '', $default = null, $filter = null) public function route($name = '', $default = null, $filter = null)
{ {
if (is_array($name)) { if (is_array($name)) {
$this->param = [];
return $this->route = array_merge($this->route, $name); return $this->route = array_merge($this->route, $name);
} }
return $this->input($this->route, $name, $default, $filter); return $this->input($this->route, $name, $default, $filter);
@@ -658,6 +654,7 @@ class Request
public function get($name = '', $default = null, $filter = null) public function get($name = '', $default = null, $filter = null)
{ {
if (is_array($name)) { if (is_array($name)) {
$this->param = [];
return $this->get = array_merge($this->get, $name); return $this->get = array_merge($this->get, $name);
} elseif (empty($this->get)) { } elseif (empty($this->get)) {
$this->get = $_GET; $this->get = $_GET;
@@ -676,6 +673,7 @@ class Request
public function post($name = '', $default = null, $filter = null) public function post($name = '', $default = null, $filter = null)
{ {
if (is_array($name)) { if (is_array($name)) {
$this->param = [];
return $this->post = array_merge($this->post, $name); return $this->post = array_merge($this->post, $name);
} elseif (empty($this->post)) { } elseif (empty($this->post)) {
$this->post = $_POST; $this->post = $_POST;
@@ -694,6 +692,7 @@ class Request
public function put($name = '', $default = null, $filter = null) public function put($name = '', $default = null, $filter = null)
{ {
if (is_array($name)) { if (is_array($name)) {
$this->param = [];
return $this->put = is_null($this->put) ? $name : array_merge($this->put, $name); return $this->put = is_null($this->put) ? $name : array_merge($this->put, $name);
} }
if (is_null($this->put)) { if (is_null($this->put)) {
@@ -743,6 +742,7 @@ class Request
public function request($name = '', $default = null, $filter = null) public function request($name = '', $default = null, $filter = null)
{ {
if (is_array($name)) { if (is_array($name)) {
$this->param = [];
return $this->request = array_merge($this->request, $name); return $this->request = array_merge($this->request, $name);
} elseif (empty($this->request)) { } elseif (empty($this->request)) {
$this->request = $_REQUEST; $this->request = $_REQUEST;