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

Merge branch 'master' of https://github.com/top-think/framework

Browse Source
This commit is contained in:
thinkphp
2017-06-01 16:22:18 +08:00
parent fa36ae58ba 73cafb95dc
commit 05837a9590
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
library/think/Validate.php
View File

@@ -165,7 +165,7 @@ class Validate
} }
/** /**
* 获取验证规则的默认提示信息 * 设置验证规则的默认提示信息
* @access protected * @access protected
* @param string|array $type 验证规则类型名称或者数组 * @param string|array $type 验证规则类型名称或者数组
* @param string $msg 验证提示信息 * @param string $msg 验证提示信息

2
library/think/db/Builder.php
View File

@@ -376,7 +376,7 @@ abstract class Builder
if ($value instanceof \Closure) { if ($value instanceof \Closure) {
$whereStr .= $key . ' ' . $exp . ' ' . $this->parseClosure($value); $whereStr .= $key . ' ' . $exp . ' ' . $this->parseClosure($value);
} else { } else {
$value = is_array($value) ? $value : explode(',', $value); $value = array_unique(is_array($value) ? $value : explode(',', $value));
if (array_key_exists($field, $binds)) { if (array_key_exists($field, $binds)) {
$bind = []; $bind = [];
$array = []; $array = [];

4
library/think/db/Query.php
View File

@@ -395,7 +395,7 @@ class Query
public function value($field, $default = null, $force = false) public function value($field, $default = null, $force = false)
{ {
$result = false; $result = false;
if (empty($options['fetch_sql']) && !empty($this->options['cache'])) { if (empty($this->options['fetch_sql']) && !empty($this->options['cache'])) {
// 判断查询缓存 // 判断查询缓存
$cache = $this->options['cache']; $cache = $this->options['cache'];
if (empty($this->options['table'])) { if (empty($this->options['table'])) {
@@ -438,7 +438,7 @@ class Query
public function column($field, $key = '') public function column($field, $key = '')
{ {
$result = false; $result = false;
if (empty($options['fetch_sql']) && !empty($this->options['cache'])) { if (empty($this->options['fetch_sql']) && !empty($this->options['cache'])) {
// 判断查询缓存 // 判断查询缓存
$cache = $this->options['cache']; $cache = $this->options['cache'];
if (empty($this->options['table'])) { if (empty($this->options['table'])) {