Cleanup

joomla · May 13, 2018 · 0e03396 · 0e03396
1 parent 6bdd170
commit 0e03396
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/libraries/src/Form/Rule/EmailRule.php b/libraries/src/Form/Rule/EmailRule.php
@@ -133,14 +133,17 @@ public function test(\SimpleXMLElement $element, $value, $group = null, Registry
 					$domainParts = array_reverse(explode('.', $domain->name));
 					$status      = 0;
 
-					if ($emailCount >= count($domainParts))
+					// Don't run if the email has less segments than the rule.
+					if ($emailCount < count($domainParts))
 					{
-						foreach ($emailParts as $key => $emailPart)
+						continue;
+					}
+
+					foreach ($emailParts as $key => $emailPart)
+					{
+						if (!isset($domainParts[$key]) || $domainParts[$key] == $emailPart || $domainParts[$key] == '*')
 						{
-							if ($domainParts[$key] == $emailPart || $domainParts[$key] == '*')
-							{
-								$status++;
-							}
+							$status++;
 						}
 					}