mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-07 23:22: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-02-18 21:33:34 +08:00
parent f00825a477 09629cda78
commit e9dd69953b
3 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
library/think/Model.php
View File

@@ -508,7 +508,7 @@ abstract class Model implements \JsonSerializable, \ArrayAccess
$value = json_decode($value, true); $value = json_decode($value, true);
break; break;
case 'array': case 'array':
$value = is_null($value) ? [] : json_decode($value, true); $value = empty($value) ? [] : json_decode($value, true);
break; break;
case 'object': case 'object':
$value = empty($value) ? new \stdClass() : json_decode($value); $value = empty($value) ? new \stdClass() : json_decode($value);

3
library/think/Route.php
View File

@@ -1281,9 +1281,6 @@ class Route
} elseif (strpos($url, '/')) { } elseif (strpos($url, '/')) {
// [模块/控制器/操作] // [模块/控制器/操作]
$path = explode('/', $url); $path = explode('/', $url);
} elseif (false !== strpos($url, '=')) {
// 参数1=值1&参数2=值2...
parse_str($url, $var);
} else { } else {
$path = [$url]; $path = [$url];
} }

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

@@ -379,7 +379,7 @@ abstract class Builder
} else { } else {
$zone = implode(',', $this->parseValue($value, $field)); $zone = implode(',', $this->parseValue($value, $field));
} }
$whereStr .= $key . ' ' . $exp . ' (' . $zone . ')'; $whereStr .= $key . ' ' . $exp . ' (' . (empty($zone) ? "''" : $zone) . ')';
} }
} elseif (in_array($exp, ['NOT BETWEEN', 'BETWEEN'])) { } elseif (in_array($exp, ['NOT BETWEEN', 'BETWEEN'])) {
// BETWEEN 查询 // BETWEEN 查询