aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoseph Warner <hardolaf@hardolaf.com>2013-07-11 15:45:44 -0400
committerJoseph Warner <hardolaf@hardolaf.com>2013-07-11 15:46:08 -0400
commit9c0495664d8d89c5ee8e6187e40afbe353acf033 (patch)
treebebeb448e18ccbf20125414cb591160aa5f1e232
parente2435f25d90913455e0b8ffd92fb0918cf6f376f (diff)
downloadforums-9c0495664d8d89c5ee8e6187e40afbe353acf033.tar
forums-9c0495664d8d89c5ee8e6187e40afbe353acf033.tar.gz
forums-9c0495664d8d89c5ee8e6187e40afbe353acf033.tar.bz2
forums-9c0495664d8d89c5ee8e6187e40afbe353acf033.tar.xz
forums-9c0495664d8d89c5ee8e6187e40afbe353acf033.zip
[feature/auth-refactor] Remove invalid providers from acp select
PHPBB3-9734
-rw-r--r--phpBB/includes/acp/acp_board.php10
1 files changed, 4 insertions, 6 deletions
diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index 19219f6323..f142801b72 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -563,12 +563,6 @@ class acp_board
if (array_key_exists('auth.provider.' . $method, $auth_providers))
{
$provider = $auth_providers['auth.provider.' . $method];
-
- if (!($provider instanceof phpbb_auth_provider_interface))
- {
- throw new \RuntimeException($provider . ' must implement phpbb_auth_provider_interface');
- }
-
if ($error = $provider->init())
{
foreach ($old_auth_config as $config_name => $config_value)
@@ -686,6 +680,10 @@ class acp_board
foreach($auth_providers as $key => $value)
{
+ if (!($provider instanceof phpbb_auth_provider_interface))
+ {
+ continue;
+ }
$auth_plugins[] = str_replace('auth.provider.', '', $key);
}