diff options
| author | Matt Friedman <maf675@gmail.com> | 2013-10-15 10:29:15 -0700 |
|---|---|---|
| committer | Matt Friedman <maf675@gmail.com> | 2013-10-15 10:29:15 -0700 |
| commit | 86082040975ca453edb3871febce74517c676084 (patch) | |
| tree | 5eb2806a4f64c2e883cc91a3dd63ca3d4896a29e /phpBB/includes | |
| parent | 9363986f43aeb6ff6b5f9627eb42aee1ea2eaf57 (diff) | |
| download | forums-86082040975ca453edb3871febce74517c676084.tar forums-86082040975ca453edb3871febce74517c676084.tar.gz forums-86082040975ca453edb3871febce74517c676084.tar.bz2 forums-86082040975ca453edb3871febce74517c676084.tar.xz forums-86082040975ca453edb3871febce74517c676084.zip | |
[ticket/11921] Improve appearance of PM notifications in linklist
PHPBB3-11921
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions.php | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 947e29ea02..527d955b0b 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -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'] : '', |