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

[ticket/13713] Create abstract parent service for user source

Browse Source 
PHPBB3-13713
This commit is contained in:
lavigor
2018-06-09 19:52:21 +03:00
committed by Marc Alexander
parent 52c2e11fdd
commit 52fac451a3
3 changed files with 25 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
phpBB/phpbb/textformatter/s9e/mention_helper.php
View File

@@ -35,7 +35,7 @@ class mention_helper
/**
* @var array Array of users' and groups' colors for each cached ID
*/
protected $cached_colors = [];
protected $cached_colours = [];
/**
* Constructor
@@ -59,9 +59,9 @@ class mention_helper
*/
protected function get_colors($user_ids, $group_ids)
{
$this->cached_colors = [];
$this->cached_colors['users'] = [];
$this->cached_colors['groups'] = [];
$this->cached_colours = [];
$this->cached_colours['users'] = [];
$this->cached_colours['groups'] = [];
if (!empty($user_ids))
{
@@ -78,7 +78,7 @@ class mention_helper
while ($row = $this->db->sql_fetchrow($result))
{
$this->cached_colors['users'][$row['user_id']] = $row['user_colour'];
$this->cached_colours['users'][$row['user_id']] = $row['user_colour'];
}
$this->db->sql_freeresult($result);
@@ -97,7 +97,7 @@ class mention_helper
while ($row = $this->db->sql_fetchrow($result))
{
$this->cached_colors['groups'][$row['group_id']] = $row['group_colour'];
$this->cached_colours['groups'][$row['group_id']] = $row['group_colour'];
}
$this->db->sql_freeresult($result);
@@ -130,18 +130,18 @@ class mention_helper
{
$attributes['profile_url'] = str_replace('{USER_ID}', $attributes['user_id'], $user_profile_url);
if (!empty($this->cached_colors['users'][$attributes['user_id']]))
if (!empty($this->cached_colours['users'][$attributes['user_id']]))
{
$attributes['color'] = $this->cached_colors['users'][$attributes['user_id']];
$attributes['color'] = $this->cached_colours['users'][$attributes['user_id']];
}
}
else if (isset($attributes['group_id']))
{
$attributes['profile_url'] = str_replace('{GROUP_ID}', $attributes['group_id'], $group_profile_url);
if (!empty($this->cached_colors['groups'][$attributes['group_id']]))
if (!empty($this->cached_colours['groups'][$attributes['group_id']]))
{
$attributes['color'] = $this->cached_colors['groups'][$attributes['group_id']];
$attributes['color'] = $this->cached_colours['groups'][$attributes['group_id']];
}
}