diff options
| author | Cesar G <prototech91@gmail.com> | 2014-07-03 23:02:11 -0700 |
|---|---|---|
| committer | Cesar G <prototech91@gmail.com> | 2014-07-03 23:02:11 -0700 |
| commit | 5878314671954526c4cbf74417b02c1c963f0e37 (patch) | |
| tree | 206b6fa20ab144467674c66d4612192ea0970a18 /phpBB/includes | |
| parent | 0deacb843865bea01f24d39040209c73eb087056 (diff) | |
| parent | d8d6e3e943e718b4520059a04624a3922b916534 (diff) | |
| download | forums-5878314671954526c4cbf74417b02c1c963f0e37.tar forums-5878314671954526c4cbf74417b02c1c963f0e37.tar.gz forums-5878314671954526c4cbf74417b02c1c963f0e37.tar.bz2 forums-5878314671954526c4cbf74417b02c1c963f0e37.tar.xz forums-5878314671954526c4cbf74417b02c1c963f0e37.zip | |
Merge remote-tracking branch 'PayBas/ticket/12662' into develop-ascraeus
* PayBas/ticket/12662: (29 commits)
[ticket/12662] Hide quick-links when empty
[ticket/12662] Fix white-space issue to make dropdowns uniform
[ticket/12662] Remove last remaining linklist outside navbars
[ticket/12662] Use data-last-responsive attr instead of hardcoded list
[ticket/12662] Remove <li> container from logged_out_content event
[ticket/12662] Username <span> fix for list columns
[ticket/12662] Fix notifications dropdown positioning for RTL
[ticket/12662] Update tests that utilize get_username_string
[ticket/12662] Update subsilver2 index template event names
[ticket/12662] Update events docs from b5 to rc1/rc2
[ticket/12662] Move dropdown container from <li> to new inner div
[ticket/12662] Remove linklist container and update template events
[ticket/12662] Add span containers to all usernames for consistency
[ticket/12662] IE8 fixes
[ticket/12662] Fix responsive positioning of notifications dropdown
[ticket/12662] Remove inherited props from ddown-extendended
[ticket/12662] Change CSS selectors to direct descendants for linklist
[ticket/12662] Reorder icon CSS rules alphabetically
[ticket/12662] Use slack variable to determine line-break sensitivity
[ticket/12662] Change new event names and fix events.md
...
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions.php | 1 | ||||
| -rw-r--r-- | phpBB/includes/functions_content.php | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 0838f2008e..48cd30e0a4 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -4912,6 +4912,7 @@ function page_header($page_title = '', $display_online_list = false, $item_id = 'PRIVATE_MESSAGE_COUNT' => (!empty($user->data['user_unread_privmsg'])) ? $user->data['user_unread_privmsg'] : 0, 'CURRENT_USER_AVATAR' => phpbb_get_user_avatar($user->data), + 'CURRENT_USERNAME_SIMPLE' => get_username_string('no_profile', $user->data['user_id'], $user->data['username'], $user->data['user_colour']), 'CURRENT_USERNAME_FULL' => get_username_string('full', $user->data['user_id'], $user->data['username'], $user->data['user_colour']), 'UNREAD_NOTIFICATIONS_COUNT' => ($notifications !== false) ? $notifications['unread_count'] : '', 'NOTIFICATIONS_COUNT' => ($notifications !== false) ? $notifications['unread_count'] : '', diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php index 74b3e0c70f..09bd3e6cdb 100644 --- a/phpBB/includes/functions_content.php +++ b/phpBB/includes/functions_content.php @@ -1334,9 +1334,9 @@ function get_username_string($mode, $user_id, $username, $username_colour = '', global $phpbb_root_path, $phpEx; $_profile_cache['base_url'] = append_sid("{$phpbb_root_path}memberlist.$phpEx", 'mode=viewprofile&u={USER_ID}'); - $_profile_cache['tpl_noprofile'] = '{USERNAME}'; + $_profile_cache['tpl_noprofile'] = '<span class="username">{USERNAME}</span>'; $_profile_cache['tpl_noprofile_colour'] = '<span style="color: {USERNAME_COLOUR};" class="username-coloured">{USERNAME}</span>'; - $_profile_cache['tpl_profile'] = '<a href="{PROFILE_URL}">{USERNAME}</a>'; + $_profile_cache['tpl_profile'] = '<a href="{PROFILE_URL}" class="username">{USERNAME}</a>'; $_profile_cache['tpl_profile_colour'] = '<a href="{PROFILE_URL}" style="color: {USERNAME_COLOUR};" class="username-coloured">{USERNAME}</a>'; } |