aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp
diff options
context:
space:
mode:
authorNathan Guse <nathaniel.guse@gmail.com>2013-07-13 10:37:43 -0700
committerNathan Guse <nathaniel.guse@gmail.com>2013-07-13 10:37:43 -0700
commitb6c3939c32747f388081b42aa6f303e76ebd8fbf (patch)
treeb94a8cd70c5fb056a29ee6b862bd88fa993874ed /phpBB/includes/acp
parentf22a53f2cf5d2894a5e8cacbf9884f9e537f54f5 (diff)
parent8f95ef55a65cbf58e74840957cf9acfaf9e16d31 (diff)
downloadforums-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/includes/acp')
-rw-r--r--phpBB/includes/acp/acp_main.php4
1 files changed, 1 insertions, 3 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))