diff options
-rw-r--r-- | phpBB/includes/functions.php | 10 | ||||
-rw-r--r-- | phpBB/index.php | 2 | ||||
-rw-r--r-- | phpBB/memberlist.php | 2 | ||||
-rw-r--r-- | phpBB/phpbb/controller/helper.php | 2 | ||||
-rw-r--r-- | phpBB/phpbb/event/kernel_exception_subscriber.php | 2 | ||||
-rw-r--r-- | phpBB/posting.php | 4 | ||||
-rw-r--r-- | phpBB/report.php | 2 | ||||
-rw-r--r-- | phpBB/search.php | 4 | ||||
-rw-r--r-- | phpBB/ucp.php | 2 | ||||
-rw-r--r-- | phpBB/viewonline.php | 4 |
10 files changed, 17 insertions, 17 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index ebd676b17a..4d962db308 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2679,7 +2679,7 @@ function confirm_box($check, $title = '', $hidden = '', $html_body = 'confirm_bo } else { - page_header(((!isset($user->lang[$title])) ? $user->lang['CONFIRM'] : $user->lang[$title]), false); + page_header((!isset($user->lang[$title])) ? $user->lang['CONFIRM'] : $user->lang[$title]); } $template->set_filenames(array( @@ -2956,7 +2956,7 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa 'PASSWORD_CREDENTIAL' => ($admin) ? 'password_' . $credential : 'password', )); - page_header($user->lang['LOGIN'], false); + page_header($user->lang['LOGIN']); $template->set_filenames(array( 'body' => 'login_body.html') @@ -3032,7 +3032,7 @@ function login_forum_box($forum_data) $template->assign_var('LOGIN_ERROR', $user->lang['WRONG_PASSWORD']); } - page_header($user->lang['LOGIN'], false); + page_header($user->lang['LOGIN']); $template->assign_vars(array( 'FORUM_NAME' => isset($forum_data['forum_name']) ? $forum_data['forum_name'] : '', @@ -3945,7 +3945,7 @@ function msg_handler($errno, $msg_text, $errfile, $errline) } else { - page_header($msg_title, false); + page_header($msg_title); } } @@ -4622,7 +4622,7 @@ function phpbb_build_hidden_fields_for_query_params($request, $exclude = null) /** * Generate page header */ -function page_header($page_title = '', $display_online_list = true, $item_id = 0, $item = 'forum') +function page_header($page_title = '', $display_online_list = false, $item_id = 0, $item = 'forum') { global $db, $config, $template, $SID, $_SID, $_EXTRA_URL, $user, $auth, $phpEx, $phpbb_root_path; global $phpbb_dispatcher, $request, $phpbb_container, $phpbb_admin_path; diff --git a/phpBB/index.php b/phpBB/index.php index c363781667..49baf33392 100644 --- a/phpBB/index.php +++ b/phpBB/index.php @@ -193,7 +193,7 @@ $vars = array('page_title'); extract($phpbb_dispatcher->trigger_event('core.index_modify_page_title', compact($vars))); // Output page -page_header($page_title); +page_header($page_title, true); $template->set_filenames(array( 'body' => 'index_body.html') diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index 8db2fef2a3..186868e371 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -1623,7 +1623,7 @@ switch ($mode) } // Output the page -page_header($page_title, false); +page_header($page_title); $template->set_filenames(array( 'body' => $template_html) diff --git a/phpBB/phpbb/controller/helper.php b/phpBB/phpbb/controller/helper.php index 10fdbb1375..98758c0371 100644 --- a/phpBB/phpbb/controller/helper.php +++ b/phpBB/phpbb/controller/helper.php @@ -79,7 +79,7 @@ class helper */ public function render($template_file, $page_title = '', $status_code = 200) { - page_header($page_title); + page_header($page_title, true); $this->template->set_filenames(array( 'body' => $template_file, diff --git a/phpBB/phpbb/event/kernel_exception_subscriber.php b/phpBB/phpbb/event/kernel_exception_subscriber.php index 8a4de1fbad..74037d8444 100644 --- a/phpBB/phpbb/event/kernel_exception_subscriber.php +++ b/phpBB/phpbb/event/kernel_exception_subscriber.php @@ -49,7 +49,7 @@ class kernel_exception_subscriber implements EventSubscriberInterface */ public function on_kernel_exception(GetResponseForExceptionEvent $event) { - page_header($this->user->lang('INFORMATION')); + page_header($this->user->lang('INFORMATION'), true); $exception = $event->getException(); diff --git a/phpBB/posting.php b/phpBB/posting.php index 442e1d9782..ebb0af3adf 100644 --- a/phpBB/posting.php +++ b/phpBB/posting.php @@ -1595,7 +1595,7 @@ if ($allowed) posting_gen_attachment_entry($attachment_data, $filename_data, $allowed); // Output page ... -page_header($page_title, false); +page_header($page_title); $template->set_filenames(array( 'body' => 'posting_body.html') @@ -1623,7 +1623,7 @@ function upload_popup($forum_style = 0) ($forum_style) ? $user->setup('posting', $forum_style) : $user->setup('posting'); - page_header($user->lang['PROGRESS_BAR'], false); + page_header($user->lang['PROGRESS_BAR']); $template->set_filenames(array( 'popup' => 'posting_progress_bar.html') diff --git a/phpBB/report.php b/phpBB/report.php index 5081f90ad1..57825e6485 100644 --- a/phpBB/report.php +++ b/phpBB/report.php @@ -307,7 +307,7 @@ $template->assign_vars(array( generate_forum_nav($forum_data); // Start output of page -page_header($page_title); +page_header($page_title, true); $template->set_filenames(array( 'body' => 'report_body.html') diff --git a/phpBB/search.php b/phpBB/search.php index 4756a941f5..d135553029 100644 --- a/phpBB/search.php +++ b/phpBB/search.php @@ -1027,7 +1027,7 @@ if ($keywords || $author || $author_id || $search_id || $submit) } unset($rowset); - page_header(($l_search_title) ? $l_search_title : $user->lang['SEARCH']); + page_header((($l_search_title) ? $l_search_title : $user->lang['SEARCH']), true); $template->set_filenames(array( 'body' => 'search_results.html') @@ -1215,7 +1215,7 @@ if ($auth->acl_get('a_search')) } // Output the basic page -page_header($user->lang['SEARCH']); +page_header($user->lang['SEARCH'], true); $template->set_filenames(array( 'body' => 'search_body.html') diff --git a/phpBB/ucp.php b/phpBB/ucp.php index 0c587cbf28..ba906bd410 100644 --- a/phpBB/ucp.php +++ b/phpBB/ucp.php @@ -128,7 +128,7 @@ switch ($mode) ); // Disable online list - page_header($user->lang[$title], false); + page_header($user->lang[$title]); $template->assign_vars(array( 'S_AGREEMENT' => true, diff --git a/phpBB/viewonline.php b/phpBB/viewonline.php index 87813596fa..e26dc4dc90 100644 --- a/phpBB/viewonline.php +++ b/phpBB/viewonline.php @@ -70,7 +70,7 @@ if ($mode == 'whois' && $auth->acl_get('a_') && $session_id) $db->sql_freeresult($result); // Output the page - page_header($user->lang['WHO_IS_ONLINE']); + page_header($user->lang['WHO_IS_ONLINE'], true); $template->set_filenames(array( 'body' => 'viewonline_whois.html') @@ -444,7 +444,7 @@ $template->assign_vars(array( $config['load_online'] = false; // Output the page -page_header($user->lang['WHO_IS_ONLINE']); +page_header($user->lang['WHO_IS_ONLINE'], true); $template->set_filenames(array( 'body' => 'viewonline_body.html') |