Merge branch '4.2-dev' into yubikey-wording

joomla · Jun 12, 2022 · 09eef0b · 09eef0b
2 parents 7c73dd4 + 8c845cc
commit 09eef0b
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/administrator/components/com_users/src/Model/UsersModel.php b/administrator/components/com_users/src/Model/UsersModel.php
@@ -14,6 +14,7 @@
 use Joomla\CMS\Component\ComponentHelper;
 use Joomla\CMS\Date\Date;
 use Joomla\CMS\Factory;
+use Joomla\CMS\Form\Form;
 use Joomla\CMS\MVC\Factory\MVCFactoryInterface;
 use Joomla\CMS\MVC\Model\ListModel;
 use Joomla\CMS\Plugin\PluginHelper;
@@ -292,12 +293,12 @@ public function getFilterForm($data = [], $loadData = true)
 	{
 		$form = parent::getFilterForm($data, $loadData);
 
-		if (empty($form) || PluginHelper::isEnabled('multifactorauth'))
+		if ($form && !PluginHelper::isEnabled('multifactorauth'))
 		{
-			return $form;
+			$form->removeField('mfa', 'filter');
 		}
 
-		$form->removeField('mfa', 'filter');
+		return $form;
 	}