added check field != matches[1] of {(\w+)\} if found

codeigniter4 · May 5, 2020 · 9333dcc · 9333dcc
1 parent 25daa42
commit 9333dcc
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/system/Validation/Rules.php b/system/Validation/Rules.php
@@ -168,7 +168,8 @@ public function is_not_unique(string $str = null, string $field, array $data): b
 
 		if (! empty($where_field) && ! empty($where_value))
 		{
-			if (! preg_match('/\{(\w+)\}/', $where_value))
+			preg_match('/{(\w+)\}/', $where_value, $matches);
+			if (! $matches || $where_field !== $matches[1])
 			{
 				$row = $row->where($where_field, $where_value);
 			}
@@ -231,7 +232,8 @@ public function is_unique(string $str = null, string $field, array $data): bool
 
 		if (! empty($ignoreField) && ! empty($ignoreValue))
 		{
-			if (! preg_match('/\{(\w+)\}/', $ignoreValue))
+			preg_match('/{(\w+)\}/', $ignoreValue, $matches);
+			if (! $matches || $ignoreField !== $matches[1])
 			{
 				$row = $row->where("{$ignoreField} !=", $ignoreValue);
 			}