makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[feature/oauth] Fall back to DB login if OAuth is enabled but not requested

Browse source 
PHPBB3-11673
This commit is contained in:
Joseph Warner 2013-07-22 15:58:32 -04:00
parent 4c48da0597
commit d804842cef
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/phpbb/auth/provider/oauth/oauth.php
View file

@ -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;