From 428a30e2965ab5cba69954f4bca82f75e042b087 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Fri, 24 Feb 2017 14:02:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E8=BF=9BRequest=E7=B1=BBparam?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/Request.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/library/think/Request.php b/library/think/Request.php
index d583ead0..f4854757 100644
--- a/library/think/Request.php
+++ b/library/think/Request.php
@@ -633,7 +633,7 @@ class Request
         if (true === $name) {
             // 获取包含文件上传信息的数组
             $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($this->param, $name, $default, $filter);
@@ -886,7 +886,7 @@ class Request
                 return $array[$name];
             }
         }
-        return;
+        return null;
     }
 
     /**