From 204b18dd593a85374927e313e1af19c86f78055b Mon Sep 17 00:00:00 2001 From: Oliver Schramm Date: Fri, 14 Sep 2018 11:21:55 +0200 Subject: [ticket/15607] Skip ban and disabled checks when deleting cookies PHPBB3-15607 --- phpBB/ucp.php | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'phpBB/ucp.php') diff --git a/phpBB/ucp.php b/phpBB/ucp.php index 7eca5ede62..b72006b37f 100644 --- a/phpBB/ucp.php +++ b/phpBB/ucp.php @@ -30,6 +30,12 @@ if (in_array($mode, array('login', 'login_link', 'logout', 'confirm', 'sendpassw define('IN_LOGIN', true); } +if ($mode === 'delete_cookies') +{ + define('SKIP_CHECK_BAN', true); + define('SKIP_CHECK_DISABLED', true); +} + // Start session management $user->session_begin(); $auth->acl($user->data); -- cgit v1.2.1 From 35d49f515092253c12ee49adf8aabdf4ce8e56a1 Mon Sep 17 00:00:00 2001 From: Jim Mossing Holsteyn Date: Sun, 23 Sep 2018 03:01:09 +0200 Subject: [ticket/15788] Fix return button for Privacy Policy Change the text from "Return to Login Page" to "Return to Previous page" as the privacy policy can now be accessed through the footer so we could return to any random previous page instead of just the login page. PHPBB3-15788 --- phpBB/ucp.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'phpBB/ucp.php') diff --git a/phpBB/ucp.php b/phpBB/ucp.php index 7eca5ede62..8cc46153b5 100644 --- a/phpBB/ucp.php +++ b/phpBB/ucp.php @@ -138,7 +138,7 @@ switch ($mode) 'AGREEMENT_TITLE' => $user->lang[$title], 'AGREEMENT_TEXT' => sprintf($user->lang[$message], $config['sitename'], generate_board_url()), 'U_BACK' => append_sid("{$phpbb_root_path}ucp.$phpEx", 'mode=login'), - 'L_BACK' => $user->lang['BACK_TO_LOGIN'], + 'L_BACK' => $user->lang['BACK_TO_PREV'], )); page_footer(); -- cgit v1.2.1