From e8fdc1545a54e87541efa404265abbd16dc31ead Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Mon, 10 Mar 2014 10:48:19 +0100 Subject: [ticket/12261] Add a functional test for redirect after using login_box() PHPBB3-12261 --- phpBB/includes/functions.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'phpBB') diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 96b4161958..11d7ea4c72 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -4899,8 +4899,6 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0 $hidden_fields_for_jumpbox = phpbb_build_hidden_fields_for_query_params($request, array('f')); $notification_mark_hash = generate_link_hash('mark_all_notifications_read'); - $redirect_url = $phpbb_path_helper->remove_web_root_path(build_url()); - // The following assigns all _common_ variables that may be used at any point in a template. $template->assign_vars(array( 'SITENAME' => $config['sitename'], @@ -4985,7 +4983,7 @@ function page_header($page_title = '', $display_online_list = true, $item_id = 0 'S_TOPIC_ID' => $topic_id, 'S_LOGIN_ACTION' => ((!defined('ADMIN_START')) ? append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=login') : append_sid("{$phpbb_admin_path}index.$phpEx", false, true, $user->session_id)), - 'S_LOGIN_REDIRECT' => build_hidden_fields(array('redirect' => $redirect_url)), + 'S_LOGIN_REDIRECT' => build_hidden_fields(array('redirect' => $phpbb_path_helper->remove_web_root_path(build_url()))), 'S_ENABLE_FEEDS' => ($config['feed_enable']) ? true : false, 'S_ENABLE_FEEDS_OVERALL' => ($config['feed_overall']) ? true : false, -- cgit v1.2.1