Commit 328bb2c0 by Qiang Xue

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

parents de35c62c faaff898
......@@ -565,9 +565,7 @@ class QueryBuilder extends \yii\base\Object
list($column, $values) = $operands;
if (!is_array($values)) {
$values = array($values);
}
$values = (array)$values;
if ($values === array() || $column === array()) {
return $operator === 'in' ? '0=1' : '';
......@@ -633,9 +631,7 @@ class QueryBuilder extends \yii\base\Object
list($column, $values) = $operands;
if (!is_array($values)) {
$values = array($values);
}
$values = (array)$values;
if ($values === array()) {
return $operator === 'LIKE' || $operator === 'OR LIKE' ? '0=1' : '';
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment