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

removed get() shortcut from find()

Browse Source
This commit is contained in:
Carsten Brandt
2014-01-10 15:56:42 +01:00
parent 3a86270de9
commit 35b5bd8ef4
1 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -66,14 +66,6 @@ class ActiveRecord extends BaseActiveRecord
{ {
$query = static::createQuery(); $query = static::createQuery();
if (is_array($q)) { if (is_array($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);
} else {
return static::get($pk);
}
}
return $query->andWhere($q)->one(); return $query->andWhere($q)->one();
} elseif ($q !== null) { } elseif ($q !== null) {
return static::get($q); return static::get($q);