mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.3.x'

Browse Source
This commit is contained in:
Marc Alexander
2021-07-06 22:02:24 +02:00
parent abbca757ff ccac4c5fe8
commit 41363c8bed
5 changed files with 65 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/phpbb/auth/provider/base.php
View File

@@ -85,7 +85,7 @@ abstract class base implements provider_interface
/**
* {@inheritdoc}
*/
public function login_link_has_necessary_data($login_link_data)
public function login_link_has_necessary_data(array $login_link_data)
{
return;
}

6
phpBB/phpbb/auth/provider/oauth/oauth.php
View File

@@ -163,7 +163,7 @@ class oauth extends base
$provider = $this->request->variable('oauth_service', '', false);
$service_name = $this->get_service_name($provider);
if ($provider === '' || !array_key_exists($service_name, $this->service_providers))
if ($provider === '' || !$this->service_providers->offsetExists($service_name))
{
return [
'status' => LOGIN_ERROR_EXTERNAL_AUTH,
@@ -411,7 +411,7 @@ class oauth extends base
/**
* {@inheritdoc}
*/
public function login_link_has_necessary_data($login_link_data)
public function login_link_has_necessary_data(array $login_link_data)
{
if (empty($login_link_data))
{
@@ -452,7 +452,7 @@ class oauth extends base
$service_name = $this->get_service_name($link_data['oauth_service']);
if (!array_key_exists($service_name, $this->service_providers))
if (!$this->service_providers->offsetExists($service_name))
{
return 'LOGIN_ERROR_OAUTH_SERVICE_DOES_NOT_EXIST';
}

2
phpBB/phpbb/auth/provider/provider_interface.php
View File

@@ -154,7 +154,7 @@ interface provider_interface
* @return string|null Returns a string with a language constant if there
* is data missing or null if there is no error.
*/
public function login_link_has_necessary_data($login_link_data);
public function login_link_has_necessary_data(array $login_link_data);
/**
* Links an external account to a phpBB account.