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

改进Request类param方法

Browse Source
This commit is contained in:
thinkphp
2017-02-24 14:02:26 +08:00
parent ddebf78c01
commit 428a30e296
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
library/think/Request.php
View File

@@ -633,7 +633,7 @@ class Request
if (true === $name) { if (true === $name) {
// 获取包含文件上传信息的数组 // 获取包含文件上传信息的数组
$file = $this->file(); $file = $this->file();
$data = array_merge($this->param, $file); $data = is_array($file) ? array_merge($this->param, $file) : $this->param;
return $this->input($data, '', $default, $filter); return $this->input($data, '', $default, $filter);
} }
return $this->input($this->param, $name, $default, $filter); return $this->input($this->param, $name, $default, $filter);
@@ -886,7 +886,7 @@ class Request
return $array[$name]; return $array[$name];
} }
} }
return; return null;
} }
/** /**