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

I函数去掉data方法

Browse Source
This commit is contained in:
thinkphp
2016-01-29 22:36:11 +08:00
parent f6a708e1f8
commit d4fbec83a1
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
helper.php
View File

@@ -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);
}
/**

2
library/think/db/driver/Oracle.php
View File

@@ -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());
}
}