From fc03a55ac38f3e74724c1fb79cdd5eeba02fe2ef Mon Sep 17 00:00:00 2001
From: oldrind <1401019000@qq.com>
Date: Thu, 21 Jan 2016 15:20:07 +0800
Subject: [PATCH] =?UTF-8?q?I=E5=87=BD=E6=95=B0=E5=A2=9E=E5=8A=A0=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 helper.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/helper.php b/helper.php
index 1d9bc211..ecd80d26 100644
--- a/helper.php
+++ b/helper.php
@@ -30,7 +30,7 @@ function C($name = '', $value = null, $range = '')
 }
 
 // 获取输入数据 支持默认值和过滤
-function I($key, $default = null, $filter = '')
+function I($key, $default = null, $filter = '', $merge = false, $data = [])
 {
     if ($pos = strpos($key, '.')) {
         // 指定参数来源
@@ -44,7 +44,7 @@ function I($key, $default = null, $filter = '')
         // 默认为自动判断
         $method = 'param';
     }
-    return \think\Input::$method($key, $default, $filter);
+    return \think\Input::$method($key, $default, $filter, $merge, $data);
 }
 
 /**