From d4fbec83a17d38da267245fc67280070978badd3 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Fri, 29 Jan 2016 22:36:11 +0800
Subject: [PATCH] =?UTF-8?q?I=E5=87=BD=E6=95=B0=E5=8E=BB=E6=8E=89data?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 helper.php                         | 6 +++---
 library/think/db/driver/Oracle.php | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/helper.php b/helper.php
index b2fb7828..d3199031 100644
--- a/helper.php
+++ b/helper.php
@@ -30,7 +30,7 @@ function C($name = '', $value = null, $range = '')
 }
 
 // 获取输入数据 支持默认值和过滤
-function I($key, $default = null, $filter = '', $merge = false, $data = [])
+function I($key, $default = null, $filter = '', $merge = false)
 {
     if (0 === strpos($key, '?')) {
         $key = substr($key, 1);
@@ -41,7 +41,7 @@ function I($key, $default = null, $filter = '', $merge = false, $data = [])
     if ($pos = strpos($key, '.')) {
         // 指定参数来源
         $method = substr($key, 0, $pos);
-        if (in_array($method, ['get', 'post', 'put', 'param', 'request', 'session', 'cookie', 'server', 'globals', 'env', 'path', 'file', 'data'])) {
+        if (in_array($method, ['get', 'post', 'put', 'param', 'request', 'session', 'cookie', 'server', 'globals', 'env', 'path', 'file'])) {
             $key = substr($key, $pos + 1);
         } else {
             $method = 'param';
@@ -50,7 +50,7 @@ function I($key, $default = null, $filter = '', $merge = false, $data = [])
         // 默认为自动判断
         $method = 'param';
     }
-    return \think\Input::$method($has . $key, $default, $filter, $merge, $data);
+    return \think\Input::$method($has . $key, $default, $filter, $merge);
 }
 
 /**
diff --git a/library/think/db/driver/Oracle.php b/library/think/db/driver/Oracle.php
index 78ffb501..d3ab4727 100644
--- a/library/think/db/driver/Oracle.php
+++ b/library/think/db/driver/Oracle.php
@@ -86,7 +86,7 @@ class Oracle extends Driver
             }
             return $this->numRows;
         } catch (\PDOException $e) {
-            throw new \Exception($this->getError());
+            throw new \think\Exception($this->getError());
         }
     }