mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-12 19:54:12 +02:00
Code Issues Releases Wiki Activity

[ticket/13713] Implement avatars

Browse Source 
PHPBB3-13713
This commit is contained in:
lavigor
2018-06-01 17:59:31 +03:00
committed by Marc Alexander
parent eec7703d3b
commit a176be4c1d
9 changed files with 82 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
phpBB/phpbb/mention/controller/mention.php
View File

@@ -43,10 +43,10 @@ class mention
public function handle()
{
if (!$this->request->is_ajax())
{
redirect(append_sid($this->phpbb_root_path . 'index.' . $this->php_ext));
}
// if (!$this->request->is_ajax())
// {
// redirect(append_sid($this->phpbb_root_path . 'index.' . $this->php_ext));
// }
$keyword = $this->request->variable('keyword', '', true);
$topic_id = $this->request->variable('topic_id', 0);

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

@@ -21,11 +21,11 @@ class friend extends user
/**
* Constructor
*/
public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\user $user)
public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\user_loader $user_loader, \phpbb\user $user)
{
$this->user = $user;
parent::__construct($db);
parent::__construct($db, $user_loader);
}
/**

10
phpBB/phpbb/mention/source/group.php
View File

@@ -94,9 +94,13 @@ abstract class group implements source_interface
foreach ($group_ids as $group_id)
{
$names['g' . $group_id] = [
'name' => $groups[$group_id]['group_name'],
'param' => 'group_id',
'id' => $group_id,
'name' => $groups[$group_id]['group_name'],
'param' => 'group_id',
'id' => $group_id,
'avatar' => [
'type' => 'group',
'src' => phpbb_get_group_avatar($groups[$group_id]),
],
];
}

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

@@ -18,12 +18,16 @@ abstract class user implements source_interface
/** @var \phpbb\db\driver\driver_interface */
protected $db;
/** @var \phpbb\user_loader */
protected $user_loader;
/**
* Constructor
*/
public function __construct(\phpbb\db\driver\driver_interface $db)
public function __construct(\phpbb\db\driver\driver_interface $db, \phpbb\user_loader $user_loader)
{
$this->db = $db;
$this->user_loader = $user_loader;
}
/**
@@ -47,9 +51,13 @@ abstract class user implements source_interface
while ($row = $this->db->sql_fetchrow($res))
{
$names['u' . $row['user_id']] = [
'name' => $row['username'],
'param' => 'user_id',
'id' => $row['user_id'],
'name' => $row['username'],
'param' => 'user_id',
'id' => $row['user_id'],
'avatar' => [
'type' => 'user',
'src' => $this->user_loader->get_avatar($row['user_id'], true),
],
];
}