diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-07-13 12:02:49 -0400 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-07-13 12:02:49 -0400 |
| commit | 7d0c1d02ca428305f3cd4b57249c90d0d86bc3ae (patch) | |
| tree | 374a26be367db28949ea6191db58f0b0674c8d02 | |
| parent | fd10d97cb1e6c43b88b923bab1015cafe03d379c (diff) | |
| download | forums-7d0c1d02ca428305f3cd4b57249c90d0d86bc3ae.tar forums-7d0c1d02ca428305f3cd4b57249c90d0d86bc3ae.tar.gz forums-7d0c1d02ca428305f3cd4b57249c90d0d86bc3ae.tar.bz2 forums-7d0c1d02ca428305f3cd4b57249c90d0d86bc3ae.tar.xz forums-7d0c1d02ca428305f3cd4b57249c90d0d86bc3ae.zip | |
[ticket/11684] Remove useless confirmation page after login and admin login
PHPBB3-11684
| -rw-r--r-- | phpBB/includes/functions.php | 3 | ||||
| -rw-r--r-- | tests/test_framework/phpbb_functional_test_case.php | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 6a1b3fd4f8..200614252a 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -3301,8 +3301,7 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa return; } - $redirect = meta_refresh(3, $redirect); - trigger_error($message . '<br /><br />' . sprintf($l_redirect, '<a href="' . $redirect . '">', '</a>')); + redirect($redirect); } // Something failed, determine what... diff --git a/tests/test_framework/phpbb_functional_test_case.php b/tests/test_framework/phpbb_functional_test_case.php index f27e339bb7..2f5de76c11 100644 --- a/tests/test_framework/phpbb_functional_test_case.php +++ b/tests/test_framework/phpbb_functional_test_case.php @@ -610,7 +610,7 @@ class phpbb_functional_test_case extends phpbb_test_case $form = $crawler->selectButton($this->lang('LOGIN'))->form(); $crawler = self::submit($form, array('username' => $username, 'password' => $username . $username)); - $this->assertContains($this->lang('LOGIN_REDIRECT'), $crawler->filter('html')->text()); + $this->assertNotContains($this->lang('LOGIN'), $crawler->filter('.navbar')->text()); $cookies = self::$cookieJar->all(); @@ -659,7 +659,7 @@ class phpbb_functional_test_case extends phpbb_test_case if (strpos($field, 'password_') === 0) { $crawler = self::submit($form, array('username' => $username, $field => $username . $username)); - $this->assertContains($this->lang('LOGIN_ADMIN_SUCCESS'), $crawler->filter('html')->text()); + $this->assertContains($this->lang('ADMIN_PANEL'), $crawler->filter('h1')->text()); $cookies = self::$cookieJar->all(); |