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

use andWhere() in AR::find() to work properly with default scope

Browse Source 
fixes #1469
This commit is contained in:
Carsten Brandt
2013-12-12 12:07:28 +01:00
parent 3fba6dc314
commit 43f19e8aee
5 changed files with 33 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
extensions/yii/elasticsearch/ActiveRecord.php
View File

@@ -67,7 +67,7 @@ class ActiveRecord extends BaseActiveRecord
{
$query = static::createQuery();
if (is_array($q)) {
if (count($q) == 1 && (array_key_exists(ActiveRecord::PRIMARY_KEY_NAME, $q))) {
if (count($q) == 1 && (array_key_exists(ActiveRecord::PRIMARY_KEY_NAME, $q)) && $query->where === null) {
$pk = $q[ActiveRecord::PRIMARY_KEY_NAME];
if (is_array($pk)) {
return static::mget($pk);
@@ -75,7 +75,7 @@ class ActiveRecord extends BaseActiveRecord
return static::get($pk);
}
}
return $query->where($q)->one();
return $query->andWhere($q)->one();
} elseif ($q !== null) {
return static::get($q);
}