Merge pull request #1507 from samsonasik/valid-emails

Fix multi "empty" string separated by "," marked as valid emails
codeigniter4 · Nov 22, 2018 · 630b792 · 630b792
2 parents bf09ee5 + d94040b
commit 630b792
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/system/Validation/FormatRules.php b/system/Validation/FormatRules.php
@@ -294,7 +294,13 @@ public function valid_emails(string $str = null): bool
 
 		foreach (explode(',', $str) as $email)
 		{
-			if (trim($email) !== '' && $this->valid_email(trim($email)) === false)
+			$email = trim($email);
+			if ($email === '')
+			{
+				return false;
+			}
+
+			if ($this->valid_email($email) === false)
 			{
 				return false;
 			}

diff --git a/tests/system/Validation/FormatRulesTest.php b/tests/system/Validation/FormatRulesTest.php
@@ -241,6 +241,10 @@ public function emailsProvider()
 				null,
 				false,
 			],
+			[
+				',',
+				false,
+			],
 		];
 	}
-Original file line number
+Diff line change
@@ Expand Up / @@ -241,6 +241,10 @@ public function emailsProvider() @@
     				null,
     				false,
     			],
+    			[
+    				',',
+    				false,
+    			],
     		];
     	}
@@ Expand Down @@