diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-05-05 12:36:50 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-05-05 12:36:50 +0200 |
| commit | 324daf72fec829a4a937879ef0615829443114cc (patch) | |
| tree | d50a67b4a0deed7b40172b78a25cb6dc124492da /phpBB/includes/functions.php | |
| parent | 0cc5cf57b23c7944ed04e61cf494f0f4c5465e38 (diff) | |
| parent | a4aeb91ec08572fb7104545a8b6ba2f5274f8e3f (diff) | |
| download | forums-324daf72fec829a4a937879ef0615829443114cc.tar forums-324daf72fec829a4a937879ef0615829443114cc.tar.gz forums-324daf72fec829a4a937879ef0615829443114cc.tar.bz2 forums-324daf72fec829a4a937879ef0615829443114cc.tar.xz forums-324daf72fec829a4a937879ef0615829443114cc.zip | |
Merge pull request #2409 from prototech/ticket/12491
[ticket/12491] Fix clashing USERNAME_FULL template variable.
* prototech/ticket/12491:
[ticket/12491] Fix clashing USERNAME_FULL template variable.
Diffstat (limited to 'phpBB/includes/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 786003a9ff..3480a338c0 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -4859,7 +4859,6 @@ function page_header($page_title = '', $display_online_list = false, $item_id = // The following assigns all _common_ variables that may be used at any point in a template. $template->assign_vars(array( - 'CURRENT_USER_AVATAR' => phpbb_get_user_avatar($user->data), 'SITENAME' => $config['sitename'], 'SITE_DESCRIPTION' => $config['site_desc'], 'PAGE_TITLE' => $page_title, @@ -4870,8 +4869,10 @@ function page_header($page_title = '', $display_online_list = false, $item_id = 'TOTAL_USERS_ONLINE' => $l_online_users, 'LOGGED_IN_USER_LIST' => $online_userlist, 'RECORD_USERS' => $l_online_record, - 'PRIVATE_MESSAGE_COUNT' => (!empty($user->data['user_unread_privmsg'])) ? $user->data['user_unread_privmsg'] : 0, + '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_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'] : '', 'U_VIEW_ALL_NOTIFICATIONS' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=ucp_notifications'), @@ -4888,7 +4889,6 @@ function page_header($page_title = '', $display_online_list = false, $item_id = 'SESSION_ID' => $user->session_id, 'ROOT_PATH' => $web_path, 'BOARD_URL' => $board_url, - 'USERNAME_FULL' => get_username_string('full', $user->data['user_id'], $user->data['username'], $user->data['user_colour']), 'L_LOGIN_LOGOUT' => $l_login_logout, 'L_INDEX' => ($config['board_index_text'] !== '') ? $config['board_index_text'] : $user->lang['FORUM_INDEX'], |