mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00
Code Issues Releases Wiki Activity

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

Browse Source 
PHPBB3-13713
This commit is contained in:
lavigor
2018-09-14 12:09:30 +03:00
committed by Marc Alexander
parent 5ed207c4a0
commit e036c40b67
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
phpBB/phpbb/mention/source/base_user.php
View File

@@ -124,14 +124,14 @@ abstract class base_user implements source_interface
foreach ($users as $user) 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, [ array_push($names, [
'name' => $user['username'], 'name' => $this->user_loader->get_username($user['user_id'], 'username'),
'type' => 'u', 'type' => 'u',
'id' => $user['user_id'], 'id' => $user['user_id'],
'avatar' => [ 'avatar' => [
'type' => 'user', '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'] : '', 'rank' => (isset($user_rank['rank_title'])) ? $user_rank['rank_title'] : '',
'priority' => $this->get_priority($user), 'priority' => $this->get_priority($user),

2
phpBB/phpbb/mention/source/friend.php
View File

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

2
phpBB/phpbb/mention/source/team.php
View File

@@ -29,7 +29,7 @@ class team extends base_user
* Results will be cached in a single file * Results will be cached in a single file
*/ */
$query = $this->db->sql_build_query('SELECT_DISTINCT', [ $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' => [ 'FROM' => [
USERS_TABLE => 'u', USERS_TABLE => 'u',
USER_GROUP_TABLE => 'ug', USER_GROUP_TABLE => 'ug',

2
phpBB/phpbb/mention/source/topic.php
View File

@@ -46,7 +46,7 @@ class topic extends base_user
* Results will be cached on a per-topic basis * Results will be cached on a per-topic basis
*/ */
$query = $this->db->sql_build_query('SELECT', [ $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' => [ 'FROM' => [
USERS_TABLE => 'u', USERS_TABLE => 'u',
], ],

2
phpBB/phpbb/mention/source/user.php
View File

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