9 files changed, 16 insertions, 16 deletions
diff --git a/phpBB/faq.php b/phpBB/faq.php
index 052f78816e..53de850195 100644
--- a/phpBB/faq.php
+++ b/phpBB/faq.php
@@ -76,7 +76,7 @@ $template->assign_vars(array(
 	'SWITCH_COLUMN_MANUALLY'	=> (!$found_switch) ? true : false,
 ));
 
-page_header($l_title, false);
+page_header($l_title);
 
 $template->set_filenames(array(
 	'body' => 'faq_body.html')
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/includes/functions_module.php b/phpBB/includes/functions_module.php
index e043883145..ef2e009a6e 100644
--- a/phpBB/includes/functions_module.php
+++ b/phpBB/includes/functions_module.php
@@ -956,7 +956,7 @@ class p_master
 	/**
 	* Display module
 	*/
-	function display($page_title, $display_online_list = true)
+	function display($page_title, $display_online_list = false)
 	{
 		global $template, $user;
 
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/mcp.php b/phpBB/mcp.php
index 3fc89ba01b..1449346deb 100644
--- a/phpBB/mcp.php
+++ b/phpBB/mcp.php
@@ -284,7 +284,7 @@ $template->assign_vars(array(
 ));
 
 // Generate the page, do not display/query online list
-$module->display($module->get_page_title(), false);
+$module->display($module->get_page_title());
 
 /**
 * Functions used to generate additional URL paramters
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php
index 738b0be01c..ba4a4372a5 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..54c30c93fc 100644
--- a/phpBB/phpbb/controller/helper.php
+++ b/phpBB/phpbb/controller/helper.php
@@ -77,9 +77,9 @@ class helper
 	* @param int $status_code The status code to be sent to the page header
 	* @return Response object containing rendered page
 	*/
-	public function render($template_file, $page_title = '', $status_code = 200)
+	public function render($template_file, $page_title = '', $status_code = 200, $display_online_list = false)
 	{
-		page_header($page_title);
+		page_header($page_title, $display_online_list);
 
 		$this->template->set_filenames(array(
 			'body'	=> $template_file,
diff --git a/phpBB/posting.php b/phpBB/posting.php
index aee9ba50af..ef90c229da 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -1589,7 +1589,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')
@@ -1617,7 +1617,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/ucp.php b/phpBB/ucp.php
index 0c587cbf28..8c773886a6 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,
@@ -353,7 +353,7 @@ $module->load_active();
 $module->assign_tpl_vars(append_sid("{$phpbb_root_path}ucp.$phpEx"));
 
 // Generate the page, do not display/query online list
-$module->display($module->get_page_title(), false);
+$module->display($module->get_page_title());
 
 /**
 * Function for assigning a template var if the zebra module got included