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

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

Browse Source
This commit is contained in:
thinkphp
2016-02-02 00:03:42 +08:00
parent ac7eafe9e8 f03c662712
commit 97166efd34
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -668,7 +668,7 @@ abstract class Driver
$count = count($val);
$rule = isset($val[$count - 1]) ? (is_array($val[$count - 1]) ? strtoupper($val[$count - 1][0]) : strtoupper($val[$count - 1])) : '';
if (in_array($rule, ['AND', 'OR', 'XOR'])) {
$count = $count - 1;
--$count;
} else {
$rule = 'AND';
}