diff options
| author | Matt Friedman <maf675@gmail.com> | 2013-10-16 09:43:45 -0700 |
|---|---|---|
| committer | Matt Friedman <maf675@gmail.com> | 2013-10-16 10:07:54 -0700 |
| commit | 2867831232e8c4cb2e556b7fd157a9e0111fa696 (patch) | |
| tree | 7010e649f1a0f2f47ab1f74ab4c8cf328e0b893f /phpBB/includes | |
| parent | 457ca9c7633df2bf362f3530952afa15934e0907 (diff) | |
| download | forums-2867831232e8c4cb2e556b7fd157a9e0111fa696.tar forums-2867831232e8c4cb2e556b7fd157a9e0111fa696.tar.gz forums-2867831232e8c4cb2e556b7fd157a9e0111fa696.tar.bz2 forums-2867831232e8c4cb2e556b7fd157a9e0111fa696.tar.xz forums-2867831232e8c4cb2e556b7fd157a9e0111fa696.zip | |
[ticket/11921] Move any HTML for Notifications to the templates
PHPBB3-11921
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_notifications.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 310045ed82..a06be1960c 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -5352,7 +5352,7 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0 'HIDDEN_FIELDS_FOR_JUMPBOX' => $hidden_fields_for_jumpbox, 'UNREAD_NOTIFICATIONS_COUNT' => ($notifications !== false) ? $notifications['unread_count'] : '', - 'NOTIFICATIONS_COUNT' => ($notifications !== false) ? $user->lang('NOTIFICATIONS_COUNT', $notifications['unread_count']) : '', + 'NOTIFICATIONS_COUNT' => ($notifications !== false) ? $notifications['unread_count'] : '', 'U_VIEW_ALL_NOTIFICATIONS' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=ucp_notifications'), 'U_NOTIFICATION_SETTINGS' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'i=ucp_notifications&mode=notification_options'), 'S_NOTIFICATIONS_DISPLAY' => $config['load_notifications'], diff --git a/phpBB/includes/ucp/ucp_notifications.php b/phpBB/includes/ucp/ucp_notifications.php index 2f22f6cf9c..145963837c 100644 --- a/phpBB/includes/ucp/ucp_notifications.php +++ b/phpBB/includes/ucp/ucp_notifications.php @@ -140,7 +140,7 @@ class ucp_notifications $template->assign_vars(array( 'PAGE_NUMBER' => phpbb_on_page($template, $user, $base_url, $notifications['total_count'], $config['topics_per_page'], $start), - 'TOTAL_COUNT' => $user->lang('NOTIFICATIONS_COUNT', $notifications['total_count']), + 'TOTAL_COUNT' => $notifications['total_count'], 'U_MARK_ALL' => $base_url . '&mark=all&token=' . generate_link_hash('mark_all_notifications_read'), )); |