From d804842cef945dbc7ec2c6c1d145587c62f06f65 Mon Sep 17 00:00:00 2001
From: Joseph Warner <hardolaf@hardolaf.com>
Date: Mon, 22 Jul 2013 15:58:32 -0400
Subject: [PATCH] [feature/oauth] Fall back to DB login if OAuth is enabled but
 not requested

PHPBB3-11673
---
 phpBB/phpbb/auth/provider/oauth/oauth.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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;