mirror of
https://github.com/moodle/moodle.git
synced 2025-04-20 07:56:06 +02:00
MDL-76312 forum: sort subscribers list by fullname
This commit is contained in:
parent
0780e87f06
commit
0b1e4b57b6
@ -418,15 +418,17 @@ class subscriptions {
|
||||
|
||||
// Retrieve the forum context if it wasn't specified.
|
||||
$context = forum_get_context($forum->id, $context);
|
||||
|
||||
if (self::is_forcesubscribed($forum)) {
|
||||
$results = \mod_forum\subscriptions::get_potential_subscribers($context, $groupid, $fields, "u.email ASC");
|
||||
$results = self::get_potential_subscribers($context, $groupid, $fields);
|
||||
|
||||
} else {
|
||||
// Only active enrolled users or everybody on the frontpage.
|
||||
list($esql, $params) = get_enrolled_sql($context, '', $groupid, true);
|
||||
$params['forumid'] = $forum->id;
|
||||
|
||||
list($sort, $sortparams) = users_order_by_sql('u');
|
||||
$params = array_merge($params, $sortparams);
|
||||
|
||||
if ($includediscussionsubscriptions) {
|
||||
$params['sforumid'] = $forum->id;
|
||||
$params['dsforumid'] = $forum->id;
|
||||
@ -445,7 +447,7 @@ class subscriptions {
|
||||
JOIN {user} u ON u.id = subscriptions.userid
|
||||
JOIN ($esql) je ON je.id = u.id
|
||||
WHERE u.auth <> 'nologin' AND u.suspended = 0 AND u.confirmed = 1
|
||||
ORDER BY u.email ASC";
|
||||
ORDER BY $sort";
|
||||
|
||||
} else {
|
||||
$sql = "SELECT $fields
|
||||
@ -454,7 +456,7 @@ class subscriptions {
|
||||
JOIN {forum_subscriptions} s ON s.userid = u.id
|
||||
WHERE
|
||||
s.forum = :forumid AND u.auth <> 'nologin' AND u.suspended = 0 AND u.confirmed = 1
|
||||
ORDER BY u.email ASC";
|
||||
ORDER BY $sort";
|
||||
}
|
||||
$results = $DB->get_records_sql($sql, $params);
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user