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

Merge pull request #5755 from mrgoldy/ticket/16238

Browse source 
[ticket/16238] Remove S_REDIRECT_LOGIN work around
This commit is contained in:
Marc Alexander 2019-12-22 22:35:39 +01:00 • committed by GitHub
commit 691e64217e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
phpBB/includes/functions.php
View file

@ -4112,18 +4112,6 @@ function page_header($page_title = '', $display_online_list = false, $item_id =
// Add form token for login box, in case page is presenting a login form. // Add form token for login box, in case page is presenting a login form.
add_form_key('login', '_LOGIN'); add_form_key('login', '_LOGIN');
/**
* Workaround for missing template variable in pre phpBB 3.2.6 styles.
* @deprecated 3.2.7 (To be removed: 4.0.0-a1)
*/
$form_token_login = $template->retrieve_var('S_FORM_TOKEN_LOGIN');
if (!empty($form_token_login))
{
$s_login_redirect .= $form_token_login;
// Remove S_FORM_TOKEN_LOGIN as it's already appended to S_LOGIN_REDIRECT
$template->assign_var('S_FORM_TOKEN_LOGIN', '');
}
// The following assigns all _common_ variables that may be used at any point in a template. // The following assigns all _common_ variables that may be used at any point in a template.
$template->assign_vars(array( $template->assign_vars(array(
'SITENAME' => $config['sitename'], 'SITENAME' => $config['sitename'],