diff options
| author | Joseph Warner <hardolaf@hardolaf.com> | 2013-07-22 15:58:32 -0400 |
|---|---|---|
| committer | Joseph Warner <hardolaf@hardolaf.com> | 2013-07-22 15:58:32 -0400 |
| commit | d804842cef945dbc7ec2c6c1d145587c62f06f65 (patch) | |
| tree | 23eaed2ade6e3a8e94824dbeb7bc01f3830bb4ba | |
| parent | 4c48da0597c148c58925cdedbd4e79fb63eaf76a (diff) | |
| download | forums-d804842cef945dbc7ec2c6c1d145587c62f06f65.tar forums-d804842cef945dbc7ec2c6c1d145587c62f06f65.tar.gz forums-d804842cef945dbc7ec2c6c1d145587c62f06f65.tar.bz2 forums-d804842cef945dbc7ec2c6c1d145587c62f06f65.tar.xz forums-d804842cef945dbc7ec2c6c1d145587c62f06f65.zip | |
[feature/oauth] Fall back to DB login if OAuth is enabled but not requested
PHPBB3-11673
| -rw-r--r-- | phpBB/phpbb/auth/provider/oauth/oauth.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/auth/provider/oauth/oauth.php b/phpBB/phpbb/auth/provider/oauth/oauth.php index 20c82e63d7..7f3de0f4d9 100644 --- a/phpBB/phpbb/auth/provider/oauth/oauth.php +++ b/phpBB/phpbb/auth/provider/oauth/oauth.php @@ -109,7 +109,7 @@ class phpbb_auth_provider_oauth extends phpbb_auth_provider_base public function login($username, $password) { // Temporary workaround for only having one authentication provider available - if ($username && $password) + if (!$this->request->is_set_post('oauth_service')) { // TODO: Remove before merging global $phpbb_root_path, $phpEx; |