joomla/cms
29
0
Fork 0
mirror of https://github.com/joomla/joomla-cms.git synced 2024-06-20 19:15:27 +00:00
Code Packages Releases Activity

Update UsersModel.php for 'GROUP BY' fix (#41984)

Browse Source 
* Update UsersModel.php for 'GROUP BY' fix

* Update administrator/components/com_users/src/Model/UsersModel.php

Conform to coding style

Co-authored-by: Richard Fath <richard67@users.noreply.github.com>
This commit is contained in:
kochinc 2023-09-29 04:42:03 -04:00 committed by GitHub
parent b9561c3916
commit e52945db63
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
administrator/components/com_users/src/Model/UsersModel.php
View File

@ -365,10 +365,7 @@ class UsersModel extends ListModel
$groups = $this->getState('filter.groups');
if ($groupId || isset($groups)) {
$query->join('LEFT', '#__user_usergroup_map AS map2 ON map2.user_id = a.id')
->group(
$db->quoteName(
[
$group_by = [
'a.id',
'a.name',
'a.username',
@ -385,9 +382,14 @@ class UsersModel extends ListModel
'a.otpKey',
'a.otep',
'a.requireReset',
]
)
);
];
if (PluginHelper::isEnabled('multifactorauth')) {
$group_by[] = 'mfa.mfaRecords';
}
$query->join('LEFT', '#__user_usergroup_map AS map2 ON map2.user_id = a.id')
->group($db->quoteName($group_by));
if ($groupId) {
$groupId = (int) $groupId;