mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 05:50:42 +02:00
Code Issues Releases Wiki Activity

[ticket/11921] Improve appearance of PM notifications in linklist

Browse Source 
PHPBB3-11921
This commit is contained in:
Matt Friedman
2013-10-15 10:29:15 -07:00
parent 9363986f43
commit 8608204097
8 changed files with 15 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
phpBB/includes/functions.php
View File

@@ -5225,7 +5225,7 @@ 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']);
}
$l_privmsgs_text = $l_privmsgs_text_unread = '';
$l_privmsgs_count = '';
$s_privmsg_new = false;
// Obtain number of new private messages if user is logged in
@@ -5233,7 +5233,7 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0
{
if ($user->data['user_new_privmsg'])
{
$l_privmsgs_text = $user->lang('NEW_PMS', (int) $user->data['user_new_privmsg']);
$l_privmsgs_count = (int) $user->data['user_new_privmsg'];
if (!$user->data['user_last_privmsg'] || $user->data['user_last_privmsg'] > $user->data['session_last_visit'])
{
@@ -5251,15 +5251,13 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0
}
else
{
$l_privmsgs_text = $user->lang('NEW_PMS', 0);
$l_privmsgs_count = 0;
$s_privmsg_new = false;
}
$l_privmsgs_text_unread = '';
if ($user->data['user_unread_privmsg'] && $user->data['user_unread_privmsg'] != $user->data['user_new_privmsg'])
{
$l_privmsgs_text_unread = $user->lang('UNREAD_PMS', (int) $user->data['user_unread_privmsg']);
$l_privmsgs_count = (int) $user->data['user_unread_privmsg'];
}
}
@@ -5350,8 +5348,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_INFO' => $l_privmsgs_text,
'PRIVATE_MESSAGE_INFO_UNREAD' => $l_privmsgs_text_unread,
'PRIVATE_MESSAGE_COUNT' => $l_privmsgs_count,
'HIDDEN_FIELDS_FOR_JUMPBOX' => $hidden_fields_for_jumpbox,
'UNREAD_NOTIFICATIONS_COUNT' => ($notifications !== false) ? $notifications['unread_count'] : '',