makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'geetakshi/ticket/11360' into develop-ascraeus

Browse source 
* geetakshi/ticket/11360:
  [ticket/11360] Updating default value of $display_online_list
  [ticket/11360] Avoiding online list where not required
  [ticket/11360] Change second parameter in page_header function
This commit is contained in:
Joas Schilling 2014-03-28 17:07:16 +01:00
commit 6af942740c
9 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/faq.php
View file

@ -76,7 +76,7 @@ $template->assign_vars(array(
'SWITCH_COLUMN_MANUALLY' => (!$found_switch) ? true : false, 'SWITCH_COLUMN_MANUALLY' => (!$found_switch) ? true : false,
)); ));
page_header($l_title, false); page_header($l_title);
$template->set_filenames(array( $template->set_filenames(array(
'body' => 'faq_body.html') 'body' => 'faq_body.html')

10
phpBB/includes/functions.php
View file

@ -2679,7 +2679,7 @@ function confirm_box($check, $title = '', $hidden = '', $html_body = 'confirm_bo
} }
else 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( $template->set_filenames(array(
@ -2956,7 +2956,7 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa
'PASSWORD_CREDENTIAL' => ($admin) ? 'password_' . $credential : 'password', 'PASSWORD_CREDENTIAL' => ($admin) ? 'password_' . $credential : 'password',
)); ));
page_header($user->lang['LOGIN'], false); page_header($user->lang['LOGIN']);
$template->set_filenames(array( $template->set_filenames(array(
'body' => 'login_body.html') 'body' => 'login_body.html')
@ -3032,7 +3032,7 @@ function login_forum_box($forum_data)
$template->assign_var('LOGIN_ERROR', $user->lang['WRONG_PASSWORD']); $template->assign_var('LOGIN_ERROR', $user->lang['WRONG_PASSWORD']);
} }
page_header($user->lang['LOGIN'], false); page_header($user->lang['LOGIN']);
$template->assign_vars(array( $template->assign_vars(array(
'FORUM_NAME' => isset($forum_data['forum_name']) ? $forum_data['forum_name'] : '', 'FORUM_NAME' => isset($forum_data['forum_name']) ? $forum_data['forum_name'] : '',
@ -3945,7 +3945,7 @@ function msg_handler($errno, $msg_text, $errfile, $errline)
} }
else 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 * 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 $db, $config, $template, $SID, $_SID, $_EXTRA_URL, $user, $auth, $phpEx, $phpbb_root_path;
global $phpbb_dispatcher, $request, $phpbb_container, $phpbb_admin_path; global $phpbb_dispatcher, $request, $phpbb_container, $phpbb_admin_path;

2
phpBB/includes/functions_module.php
View file

@ -956,7 +956,7 @@ class p_master
/** /**
* Display module * Display module
*/ */
function display($page_title, $display_online_list = true) function display($page_title, $display_online_list = false)
{ {
global $template, $user; global $template, $user;

2
phpBB/index.php
View file

@ -193,7 +193,7 @@ $vars = array('page_title');
extract($phpbb_dispatcher->trigger_event('core.index_modify_page_title', compact($vars))); extract($phpbb_dispatcher->trigger_event('core.index_modify_page_title', compact($vars)));
// Output page // Output page
page_header($page_title); page_header($page_title, true);
$template->set_filenames(array( $template->set_filenames(array(
'body' => 'index_body.html') 'body' => 'index_body.html')

2
phpBB/mcp.php
View file

@ -284,7 +284,7 @@ $template->assign_vars(array(
)); ));
// Generate the page, do not display/query online list // 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 * Functions used to generate additional URL paramters

2
phpBB/memberlist.php
View file

@ -1623,7 +1623,7 @@ switch ($mode)
} }
// Output the page // Output the page
page_header($page_title, false); page_header($page_title);
$template->set_filenames(array( $template->set_filenames(array(
'body' => $template_html) 'body' => $template_html)

4
phpBB/phpbb/controller/helper.php
View file

@ -77,9 +77,9 @@ class helper
* @param int $status_code The status code to be sent to the page header * @param int $status_code The status code to be sent to the page header
* @return Response object containing rendered page * @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( $this->template->set_filenames(array(
'body' => $template_file, 'body' => $template_file,

4
phpBB/posting.php
View file

@ -1589,7 +1589,7 @@ if ($allowed)
posting_gen_attachment_entry($attachment_data, $filename_data, $allowed); posting_gen_attachment_entry($attachment_data, $filename_data, $allowed);
// Output page ... // Output page ...
page_header($page_title, false); page_header($page_title);
$template->set_filenames(array( $template->set_filenames(array(
'body' => 'posting_body.html') 'body' => 'posting_body.html')
@ -1617,7 +1617,7 @@ function upload_popup($forum_style = 0)
($forum_style) ? $user->setup('posting', $forum_style) : $user->setup('posting'); ($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( $template->set_filenames(array(
'popup' => 'posting_progress_bar.html') 'popup' => 'posting_progress_bar.html')

4
phpBB/ucp.php
View file

@ -128,7 +128,7 @@ switch ($mode)
); );
// Disable online list // Disable online list
page_header($user->lang[$title], false); page_header($user->lang[$title]);
$template->assign_vars(array( $template->assign_vars(array(
'S_AGREEMENT' => true, 'S_AGREEMENT' => true,
@ -353,7 +353,7 @@ $module->load_active();
$module->assign_tpl_vars(append_sid("{$phpbb_root_path}ucp.$phpEx")); $module->assign_tpl_vars(append_sid("{$phpbb_root_path}ucp.$phpEx"));
// Generate the page, do not display/query online list // 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 * Function for assigning a template var if the zebra module got included