diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-07-13 10:37:43 -0700 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-07-13 10:37:43 -0700 |
| commit | b6c3939c32747f388081b42aa6f303e76ebd8fbf (patch) | |
| tree | b94a8cd70c5fb056a29ee6b862bd88fa993874ed /phpBB | |
| parent | f22a53f2cf5d2894a5e8cacbf9884f9e537f54f5 (diff) | |
| parent | 8f95ef55a65cbf58e74840957cf9acfaf9e16d31 (diff) | |
| download | forums-b6c3939c32747f388081b42aa6f303e76ebd8fbf.tar forums-b6c3939c32747f388081b42aa6f303e76ebd8fbf.tar.gz forums-b6c3939c32747f388081b42aa6f303e76ebd8fbf.tar.bz2 forums-b6c3939c32747f388081b42aa6f303e76ebd8fbf.tar.xz forums-b6c3939c32747f388081b42aa6f303e76ebd8fbf.zip | |
Merge pull request #1543 from nickvergessen/ticket/11685
[ticket/11685] Remove logout confirmation page
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/acp/acp_main.php | 4 | ||||
| -rw-r--r-- | phpBB/ucp.php | 13 |
2 files changed, 7 insertions, 10 deletions
diff --git a/phpBB/includes/acp/acp_main.php b/phpBB/includes/acp/acp_main.php index a8287fe98c..eecd8c72dc 100644 --- a/phpBB/includes/acp/acp_main.php +++ b/phpBB/includes/acp/acp_main.php @@ -63,9 +63,7 @@ class acp_main if ($action === 'admlogout') { $user->unset_admin(); - $redirect_url = append_sid("{$phpbb_root_path}index.$phpEx"); - meta_refresh(3, $redirect_url); - trigger_error($user->lang['ADM_LOGGED_OUT'] . '<br /><br />' . sprintf($user->lang['RETURN_INDEX'], '<a href="' . $redirect_url . '">', '</a>')); + redirect(append_sid("{$phpbb_root_path}index.$phpEx")); } if (!confirm_box(true)) diff --git a/phpBB/ucp.php b/phpBB/ucp.php index a7e75f76c4..7180c54de6 100644 --- a/phpBB/ucp.php +++ b/phpBB/ucp.php @@ -85,17 +85,16 @@ switch ($mode) { $user->session_kill(); $user->session_begin(); - $message = $user->lang['LOGOUT_REDIRECT']; } - else + else if ($user->data['user_id'] != ANONYMOUS) { - $message = ($user->data['user_id'] == ANONYMOUS) ? $user->lang['LOGOUT_REDIRECT'] : $user->lang['LOGOUT_FAILED']; - } - meta_refresh(3, append_sid("{$phpbb_root_path}index.$phpEx")); + meta_refresh(3, append_sid("{$phpbb_root_path}index.$phpEx")); - $message = $message . '<br /><br />' . sprintf($user->lang['RETURN_INDEX'], '<a href="' . append_sid("{$phpbb_root_path}index.$phpEx") . '">', '</a> '); - trigger_error($message); + $message = $user->lang['LOGOUT_FAILED'] . '<br /><br />' . sprintf($user->lang['RETURN_INDEX'], '<a href="' . append_sid("{$phpbb_root_path}index.$phpEx") . '">', '</a> '); + trigger_error($message); + } + redirect(append_sid("{$phpbb_root_path}index.$phpEx")); break; case 'terms': |