aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2019-05-27 21:19:05 +0200
committerMarc Alexander <admin@m-a-styles.de>2019-05-27 21:19:05 +0200
commit97e92f52d7b60ec7194bbee772ab14592c551e82 (patch)
tree34dc2c3da1b0f04e9cc7cd0bf0b4eda72a7f4c36
parent95ab32525102743374277d5c0134635361ef57b5 (diff)
parent72be8e08705fa103adc6482af9712077cdceb8cc (diff)
downloadforums-97e92f52d7b60ec7194bbee772ab14592c551e82.tar
forums-97e92f52d7b60ec7194bbee772ab14592c551e82.tar.gz
forums-97e92f52d7b60ec7194bbee772ab14592c551e82.tar.bz2
forums-97e92f52d7b60ec7194bbee772ab14592c551e82.tar.xz
forums-97e92f52d7b60ec7194bbee772ab14592c551e82.zip
Merge pull request #5592 from 3D-I/ticket/16055
[ticket/16055] Fix Oauth's logins in 3.2.x
-rw-r--r--phpBB/phpbb/auth/provider/oauth/oauth.php2
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 93419d2915..5e8cb3dea8 100644
--- a/phpBB/phpbb/auth/provider/oauth/oauth.php
+++ b/phpBB/phpbb/auth/provider/oauth/oauth.php
@@ -423,7 +423,7 @@ class oauth extends \phpbb\auth\provider\base
if ($credentials['key'] && $credentials['secret'])
{
$actual_name = str_replace('auth.provider.oauth.service.', '', $service_name);
- $redirect_url = build_url(false) . '&login=external&oauth_service=' . $actual_name;
+ $redirect_url = generate_board_url() . '/ucp.' . $this->php_ext . '?mode=login&login=external&oauth_service=' . $actual_name;
$login_data['BLOCK_VARS'][$service_name] = array(
'REDIRECT_URL' => redirect($redirect_url, true),
'SERVICE_NAME' => $this->user->lang['AUTH_PROVIDER_OAUTH_SERVICE_' . strtoupper($actual_name)],