diff options
| author | Joseph Warner <hardolaf@hardolaf.com> | 2013-07-18 20:49:25 -0400 |
|---|---|---|
| committer | Joseph Warner <hardolaf@hardolaf.com> | 2013-07-18 20:49:42 -0400 |
| commit | b67032fb028b096b33c72fe7aabec55056243755 (patch) | |
| tree | 5d97a90251c008a70ced674db284aca4774e10a9 /phpBB | |
| parent | 0f292f70c78b5c2e7e19ba02bb484d14b2a94c9d (diff) | |
| download | forums-b67032fb028b096b33c72fe7aabec55056243755.tar forums-b67032fb028b096b33c72fe7aabec55056243755.tar.gz forums-b67032fb028b096b33c72fe7aabec55056243755.tar.bz2 forums-b67032fb028b096b33c72fe7aabec55056243755.tar.xz forums-b67032fb028b096b33c72fe7aabec55056243755.zip | |
[feature/oauth] Temporary workaround for only allowing one auth provider
PHPBB3-11673
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/phpbb/auth/provider/oauth/oauth.php | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/phpBB/phpbb/auth/provider/oauth/oauth.php b/phpBB/phpbb/auth/provider/oauth/oauth.php index c10ac3e9da..6f2fc52cfa 100644 --- a/phpBB/phpbb/auth/provider/oauth/oauth.php +++ b/phpBB/phpbb/auth/provider/oauth/oauth.php @@ -116,6 +116,15 @@ 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) + { + // TODO: Remove before merging + global $phpbb_root_path, $phpEx; + $provider = new phpbb_auth_provider_db($this->db, $this->config, $this->request, $this->user, $phpbb_root_path, $phpEx); + return $provider->login($username, $password); + } + // Requst the name of the OAuth service $service_name = $this->request->variable('oauth_service', '', false, phpbb_request_interface::POST); $service_name = strtolower($service_name); |