Merge pull request #5592 from 3D-I/ticket/16055

[ticket/16055] Fix Oauth's logins in 3.2.x
This commit is contained in:
Marc Alexander 2019-05-27 21:19:05 +02:00
commit 97e92f52d7
No known key found for this signature in database
GPG key ID: 50E0D2423696F995

View file

@ -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)],