改进Request类的param方法增加默认值参数 优化except方法

This commit is contained in:
thinkphp
2016-05-17 10:13:14 +08:00
parent d1f9ab38e2
commit 5e22d69e13

View File

@@ -346,9 +346,10 @@ class Request
* 当前请求的参数 * 当前请求的参数
* @access public * @access public
* @param string $name 变量名 * @param string $name 变量名
* @param mixed $default 默认值
* @return mixed * @return mixed
*/ */
public function param($name = '') public function param($name = '', $default = null)
{ {
if (empty($this->param)) { if (empty($this->param)) {
$method = $this->method(); $method = $this->method();
@@ -370,7 +371,7 @@ class Request
$this->param = array_merge(Input::get(), $vars); $this->param = array_merge(Input::get(), $vars);
} }
if ($name) { if ($name) {
return isset($this->param[$name]) ? $this->param[$name] : null; return isset($this->param[$name]) ? $this->param[$name] : $default;
} else { } else {
return $this->param; return $this->param;
} }
@@ -429,8 +430,8 @@ class Request
unset($param[$name]); unset($param[$name]);
} }
} else { } else {
foreach ($param as $key => $val) { foreach ($name as $key) {
if (in_array($key, $name)) { if (isset($param[$key])) {
unset($param[$key]); unset($param[$key]);
} }
} }