php/yii2
1
0
Fork 0
mirror of https://github.com/yiisoft/yii2.git synced 2025-11-12 11:40:19 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of git.yiisoft.com:yii2 into console-color

Browse Source
This commit is contained in:
Qiang Xue
2012-12-01 15:53:25 -05:00
parent de35c62c4e faaff8989c
commit 328bb2c0ac
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
framework/db/dao/QueryBuilder.php
View File

@@ -565,9 +565,7 @@ class QueryBuilder extends \yii\base\Object
list($column, $values) = $operands; list($column, $values) = $operands;
if (!is_array($values)) { $values = (array)$values;
$values = array($values);
}
if ($values === array() || $column === array()) { if ($values === array() || $column === array()) {
return $operator === 'in' ? '0=1' : ''; return $operator === 'in' ? '0=1' : '';
@@ -633,9 +631,7 @@ class QueryBuilder extends \yii\base\Object
list($column, $values) = $operands; list($column, $values) = $operands;
if (!is_array($values)) { $values = (array)$values;
$values = array($values);
}
if ($values === array()) { if ($values === array()) {
return $operator === 'LIKE' || $operator === 'OR LIKE' ? '0=1' : ''; return $operator === 'LIKE' || $operator === 'OR LIKE' ? '0=1' : '';