[ticket/13713] Get usernames from the data fetched by user_loader class

PHPBB3-13713
This commit is contained in:
lavigor 2018-09-14 12:09:30 +03:00 committed by Marc Alexander
parent 5ed207c4a0
commit e036c40b67
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
5 changed files with 7 additions and 7 deletions

View file

@ -124,14 +124,14 @@ abstract class base_user implements source_interface
foreach ($users as $user)
{
$user_rank = $this->user_loader->get_rank($user['user_id'], true);
$user_rank = $this->user_loader->get_rank($user['user_id']);
array_push($names, [
'name' => $user['username'],
'name' => $this->user_loader->get_username($user['user_id'], 'username'),
'type' => 'u',
'id' => $user['user_id'],
'avatar' => [
'type' => 'user',
'img' => $this->user_loader->get_avatar($user['user_id'], true),
'img' => $this->user_loader->get_avatar($user['user_id']),
],
'rank' => (isset($user_rank['rank_title'])) ? $user_rank['rank_title'] : '',
'priority' => $this->get_priority($user),

View file

@ -39,7 +39,7 @@ class friend extends base_user
* Results will be cached on a per-user basis
*/
$query = $this->db->sql_build_query('SELECT', [
'SELECT' => 'u.username_clean, u.username, u.user_id',
'SELECT' => 'u.username_clean, u.user_id',
'FROM' => [
USERS_TABLE => 'u',
],

View file

@ -29,7 +29,7 @@ class team extends base_user
* Results will be cached in a single file
*/
$query = $this->db->sql_build_query('SELECT_DISTINCT', [
'SELECT' => 'u.username_clean, u.username, u.user_id',
'SELECT' => 'u.username_clean, u.user_id',
'FROM' => [
USERS_TABLE => 'u',
USER_GROUP_TABLE => 'ug',

View file

@ -46,7 +46,7 @@ class topic extends base_user
* Results will be cached on a per-topic basis
*/
$query = $this->db->sql_build_query('SELECT', [
'SELECT' => 'u.username_clean, u.username, u.user_id, t.topic_poster',
'SELECT' => 'u.username_clean, u.user_id, t.topic_poster',
'FROM' => [
USERS_TABLE => 'u',
],

View file

@ -35,7 +35,7 @@ class user extends base_user
protected function query($keyword, $topic_id)
{
$query = $this->db->sql_build_query('SELECT', [
'SELECT' => 'u.username_clean, u.username, u.user_id',
'SELECT' => 'u.username_clean, u.user_id',
'FROM' => [
USERS_TABLE => 'u',
],