diff options
| author | Zoddo <zoddo.ino@gmail.com> | 2014-03-29 18:26:21 +0100 |
|---|---|---|
| committer | Zoddo <zoddo.ino@gmail.com> | 2014-04-01 23:19:04 +0200 |
| commit | c82c6f8d8cd337da2e6bcd33e6b9a90c13964423 (patch) | |
| tree | 1746477a5126e24ee68f43a7859ebd7bee3696e8 /phpBB | |
| parent | 6152d6c41e47a69263d127e2953c0a74cf711171 (diff) | |
| download | forums-c82c6f8d8cd337da2e6bcd33e6b9a90c13964423.tar forums-c82c6f8d8cd337da2e6bcd33e6b9a90c13964423.tar.gz forums-c82c6f8d8cd337da2e6bcd33e6b9a90c13964423.tar.bz2 forums-c82c6f8d8cd337da2e6bcd33e6b9a90c13964423.tar.xz forums-c82c6f8d8cd337da2e6bcd33e6b9a90c13964423.zip | |
[ticket/12275] Fix a bug on the event "core.modify_username_string"
Call the event "core.modify_username_string"
also if $mode is "colour", "username" or "profile".
PHPBB3-12275
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/functions_content.php | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php index 8122b87e4b..37d04c1ba0 100644 --- a/phpBB/includes/functions_content.php +++ b/phpBB/includes/functions_content.php @@ -1319,7 +1319,8 @@ function get_username_string($mode, $user_id, $username, $username_colour = '', // Return colour if ($mode == 'colour') { - return $username_colour; + $username_string = $username_colour; + break; } // no break; @@ -1339,7 +1340,8 @@ function get_username_string($mode, $user_id, $username, $username_colour = '', // Return username if ($mode == 'username') { - return $username; + $username_string = $username; + break; } // no break; @@ -1360,19 +1362,23 @@ function get_username_string($mode, $user_id, $username, $username_colour = '', // Return profile if ($mode == 'profile') { - return $profile_url; + $username_string = $profile_url; + break; } // no break; } - - 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']); - } - else + + if (empty($username_string)) { - $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']); + 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']); + } + else + { + $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']); + } } /** |