diff --git a/src/Form/BasicSetup.php b/src/Form/BasicSetup.php index f66e1a8..cdf5755 100644 --- a/src/Form/BasicSetup.php +++ b/src/Form/BasicSetup.php @@ -261,17 +261,16 @@ class BasicSetup extends FormBase { $validation_plugin_manager = \Drupal::service('plugin.manager.tfa.validation'); $validation_plugins = $validation_plugin_manager->getDefinitions(); $validation_plugin_id = str_replace('_setup', '', $storage['step_method']); - $current_plugin_is_fallback = FALSE; - if (isset($validation_plugins[$validation_plugin_id])) { - $validation_plugin = $validation_plugin_manager->createInstance($validation_plugin_id, ['uid' => $account->id()]); - $current_plugin_is_fallback = $validation_plugin->isFallback(); + $validation_plugin = $validation_plugin_manager + ->createInstance($validation_plugin_id, ['uid' => $account->id()]); + if ($validation_plugin->isFallback()) { + return; + } } - if (!$current_plugin_is_fallback) { - $params = array('account' => $account); - \Drupal::service('plugin.manager.mail')->mail('tfa', 'tfa_enabled_configuration', $account->getEmail(), $account->getPreferredLangcode(), $params); - } + $params = array('account' => $account); + \Drupal::service('plugin.manager.mail')->mail('tfa', 'tfa_enabled_configuration', $account->getEmail(), $account->getPreferredLangcode(), $params); } } }