diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2019-05-02 21:29:11 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2019-05-02 21:29:11 +0200 |
| commit | 4b6bdbe5580ccaaa73e51e15554aa9013c7020ce (patch) | |
| tree | 9231420fbbc3f419d01ca093443132232eab0f9b /phpBB/includes | |
| parent | 3c822556c137a8517dd6a34963bced89b2a150ed (diff) | |
| download | forums-4b6bdbe5580ccaaa73e51e15554aa9013c7020ce.tar forums-4b6bdbe5580ccaaa73e51e15554aa9013c7020ce.tar.gz forums-4b6bdbe5580ccaaa73e51e15554aa9013c7020ce.tar.bz2 forums-4b6bdbe5580ccaaa73e51e15554aa9013c7020ce.tar.xz forums-4b6bdbe5580ccaaa73e51e15554aa9013c7020ce.zip | |
[ticket/16042] Adjust positioning and add comment to overwrite
PHPBB3-16042
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index f39b24d94a..5234c3472d 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -4439,15 +4439,16 @@ function page_header($page_title = '', $display_online_list = false, $item_id = $controller_helper = $phpbb_container->get('controller.helper'); $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()))); /** * Workaround for missing template variable in pre phpBB 3.2.6 styles. * @deprecated 3.2.7 (To be removed: 3.3.0-a1) */ $form_token_login = $template->retrieve_var('S_FORM_TOKEN_LOGIN'); - $s_login_redirect = build_hidden_fields(array('redirect' => $phpbb_path_helper->remove_web_root_path(build_url()))); 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', ''); } |