1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 12:03:21 +01:00

[ticket/11921] Directly inject unread messages count into the template

PHPBB3-11921
This commit is contained in:
Matt Friedman 2013-10-16 10:26:33 -07:00
parent bd58c31ee0
commit ab8ac5e284

View File

@ -5225,10 +5225,9 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0
$l_online_time = $user->lang('VIEW_ONLINE_TIMES', (int) $config['load_online_time']);
}
$privmsgs_count = 0;
$s_privmsg_new = false;
// Obtain number of unread private messages if user is logged in
// Check for new private messages if user is logged in
if (!empty($user->data['is_registered']))
{
if ($user->data['user_new_privmsg'])
@ -5251,11 +5250,6 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0
{
$s_privmsg_new = false;
}
if ($user->data['user_unread_privmsg'] && $user->data['user_unread_privmsg'] != $user->data['user_new_privmsg'])
{
$privmsgs_count = (int) $user->data['user_unread_privmsg'];
}
}
$forum_id = request_var('f', 0);
@ -5345,7 +5339,7 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0
'TOTAL_USERS_ONLINE' => $l_online_users,
'LOGGED_IN_USER_LIST' => $online_userlist,
'RECORD_USERS' => $l_online_record,
'PRIVATE_MESSAGE_COUNT' => $privmsgs_count,
'PRIVATE_MESSAGE_COUNT' => (!empty($user->data['user_unread_privmsg'])) ? $user->data['user_unread_privmsg'] : 0,
'HIDDEN_FIELDS_FOR_JUMPBOX' => $hidden_fields_for_jumpbox,
'UNREAD_NOTIFICATIONS_COUNT' => ($notifications !== false) ? $notifications['unread_count'] : '',