diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-03-28 17:07:16 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-03-28 17:07:16 +0100 |
| commit | 6af942740cb534e4db6ad12bef1d1e9f297fd84e (patch) | |
| tree | ede60614efe73bd7d93c3f74f2d911a58e28bbc2 /phpBB/includes/functions.php | |
| parent | c256d7a88d617116e540fb4881605375f4f3e307 (diff) | |
| parent | 76f7ef5c837345c80f0dcefb6787f23a9c0159e7 (diff) | |
| download | forums-6af942740cb534e4db6ad12bef1d1e9f297fd84e.tar forums-6af942740cb534e4db6ad12bef1d1e9f297fd84e.tar.gz forums-6af942740cb534e4db6ad12bef1d1e9f297fd84e.tar.bz2 forums-6af942740cb534e4db6ad12bef1d1e9f297fd84e.tar.xz forums-6af942740cb534e4db6ad12bef1d1e9f297fd84e.zip | |
Merge remote-tracking branch 'geetakshi/ticket/11360' into develop-ascraeus
* 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
Diffstat (limited to 'phpBB/includes/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 10 |
1 files changed, 5 insertions, 5 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; |