diff options
| author | EA117 <admin@ea117.com> | 2019-07-28 15:15:39 -0500 |
|---|---|---|
| committer | EA117 <admin@ea117.com> | 2019-07-28 15:15:39 -0500 |
| commit | 792882ef63977c6b7ca068c65383fb8be8372172 (patch) | |
| tree | 5e55a0a698238c9859cc3e605762ad78354e9510 /phpBB/includes/functions.php | |
| parent | ae62bc46428948cdfbb735c8b9b566d02c0f78f0 (diff) | |
| download | forums-792882ef63977c6b7ca068c65383fb8be8372172.tar forums-792882ef63977c6b7ca068c65383fb8be8372172.tar.gz forums-792882ef63977c6b7ca068c65383fb8be8372172.tar.bz2 forums-792882ef63977c6b7ca068c65383fb8be8372172.tar.xz forums-792882ef63977c6b7ca068c65383fb8be8372172.zip | |
[ticket/16054] Restore ability to login from any template.
Moving the login form's add_form_key() work into page_header(), so that the
template variables required for presenting a login form are again available
to any template that chooses to consume them.
PHPBB3-16054
Diffstat (limited to 'phpBB/includes/functions.php')
| -rw-r--r-- | phpBB/includes/functions.php | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 5cc6826cb9..3a3cc44ad5 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -2526,9 +2526,6 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa )); } - // Add form token for login box - add_form_key($form_name, '_LOGIN'); - $s_hidden_fields = build_hidden_fields($s_hidden_fields); $login_box_template_data = array( @@ -2663,9 +2660,6 @@ function login_forum_box($forum_data) page_header($user->lang['LOGIN']); - // Add form token for login box - add_form_key('login', '_LOGIN'); - $template->assign_vars(array( 'FORUM_NAME' => isset($forum_data['forum_name']) ? $forum_data['forum_name'] : '', 'S_LOGIN_ACTION' => build_url(array('f')), @@ -4439,6 +4433,10 @@ function page_header($page_title = '', $display_online_list = false, $item_id = $notification_mark_hash = generate_link_hash('mark_all_notifications_read'); $s_login_redirect = build_hidden_fields(array('redirect' => $phpbb_path_helper->remove_web_root_path(build_url()))); + + // Add form token for login box, in case page is presenting a login form. + add_form_key('login', '_LOGIN'); + /** * Workaround for missing template variable in pre phpBB 3.2.6 styles. * @deprecated 3.2.7 (To be removed: 3.3.0-a1) |