makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 13:48:55 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/12275] Fix a bug on the event "core.modify_username_string"

Browse source 
Call the event "core.modify_username_string"
also if $mode is "colour", "username" or "profile".

PHPBB3-12275
This commit is contained in:
Zoddo 2014-03-29 18:26:21 +01:00
parent 6152d6c41e
commit c82c6f8d8c
1 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
phpBB/includes/functions_content.php
View file

@ -1319,7 +1319,8 @@ function get_username_string($mode, $user_id, $username, $username_colour = '',
// Return colour // Return colour
if ($mode == 'colour') if ($mode == 'colour')
{ {
return $username_colour; $username_string = $username_colour;
break;
} }
// no break; // no break;
@ -1339,7 +1340,8 @@ function get_username_string($mode, $user_id, $username, $username_colour = '',
// Return username // Return username
if ($mode == 'username') if ($mode == 'username')
{ {
return $username; $username_string = $username;
break;
} }
// no break; // no break;
@ -1360,12 +1362,15 @@ function get_username_string($mode, $user_id, $username, $username_colour = '',
// Return profile // Return profile
if ($mode == 'profile') if ($mode == 'profile')
{ {
return $profile_url; $username_string = $profile_url;
break;
} }
// no break; // no break;
} }
if (empty($username_string))
{
if (($mode == 'full' && !$profile_url) || $mode == 'no_profile') if (($mode == 'full' && !$profile_url) || $mode == 'no_profile')
{ {
$username_string = str_replace(array('{USERNAME_COLOUR}', '{USERNAME}'), array($username_colour, $username), (!$username_colour) ? $_profile_cache['tpl_noprofile'] : $_profile_cache['tpl_noprofile_colour']); $username_string = str_replace(array('{USERNAME_COLOUR}', '{USERNAME}'), array($username_colour, $username), (!$username_colour) ? $_profile_cache['tpl_noprofile'] : $_profile_cache['tpl_noprofile_colour']);
@ -1374,6 +1379,7 @@ function get_username_string($mode, $user_id, $username, $username_colour = '',
{ {
$username_string = str_replace(array('{PROFILE_URL}', '{USERNAME_COLOUR}', '{USERNAME}'), array($profile_url, $username_colour, $username), (!$username_colour) ? $_profile_cache['tpl_profile'] : $_profile_cache['tpl_profile_colour']); $username_string = str_replace(array('{PROFILE_URL}', '{USERNAME_COLOUR}', '{USERNAME}'), array($profile_url, $username_colour, $username), (!$username_colour) ? $_profile_cache['tpl_profile'] : $_profile_cache['tpl_profile_colour']);
} }
}
/** /**
* Use this event to change the output of get_username_string() * Use this event to change the output of get_username_string()