eessppeelllloo/grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2025-12-05 15:29:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Imroved UserIndex:find() to only search user if query isn't empty

Browse Source
This commit is contained in:
Matias Griese
2019-11-15 12:08:30 +02:00
parent 4332ac35db
commit 963e365da4
1 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
system/src/Grav/Common/Flex/Users/UserIndex.php
View File

@@ -80,22 +80,24 @@ class UserIndex extends FlexIndex
*/
public function find($query, $fields = ['username', 'email']): UserInterface
{
foreach ((array)$fields as $field) {
if ($field === 'key') {
$user = $this->get($query);
} elseif ($field === 'storage_key') {
$user = $this->withKeyField('storage_key')->get($query);
} elseif ($field === 'flex_key') {
$user = $this->withKeyField('flex_key')->get($query);
} elseif ($field === 'email') {
$user = $this->withKeyField('email')->get($query);
} elseif ($field === 'username') {
$user = $this->get(mb_strtolower($query));
} else {
$user = $this->__call('find', [$query, $field]);
}
if ($user) {
return $user;
if (is_string($query) && $query !== '') {
foreach ((array)$fields as $field) {
if ($field === 'key') {
$user = $this->get($query);
} elseif ($field === 'storage_key') {
$user = $this->withKeyField('storage_key')->get($query);
} elseif ($field === 'flex_key') {
$user = $this->withKeyField('flex_key')->get($query);
} elseif ($field === 'email') {
$user = $this->withKeyField('email')->get($query);
} elseif ($field === 'username') {
$user = $this->get(mb_strtolower($query));
} else {
$user = $this->__call('find', [$query, $field]);
}
if ($user) {
return $user;
}
}
}