diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2013-07-13 10:38:24 -0700 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2013-07-13 10:38:24 -0700 |
| commit | e10cbbf023aa6d0633d17804b3668a0ff09d96c7 (patch) | |
| tree | 2d1c085dda987d25a8c1daeeff41bd4919a08cbd | |
| parent | b6c3939c32747f388081b42aa6f303e76ebd8fbf (diff) | |
| parent | 7d0c1d02ca428305f3cd4b57249c90d0d86bc3ae (diff) | |
| download | forums-e10cbbf023aa6d0633d17804b3668a0ff09d96c7.tar forums-e10cbbf023aa6d0633d17804b3668a0ff09d96c7.tar.gz forums-e10cbbf023aa6d0633d17804b3668a0ff09d96c7.tar.bz2 forums-e10cbbf023aa6d0633d17804b3668a0ff09d96c7.tar.xz forums-e10cbbf023aa6d0633d17804b3668a0ff09d96c7.zip | |
Merge pull request #1541 from nickvergessen/ticket/11684
[ticket/11684] Remove useless confirmation page after login and admin login
| -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 93ad723eda..49f2e469bc 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 d72496416d..0850cf4112 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(); |