Merge pull request #3040 from element-code/develop

Fix: Model::getValidationRules() return when using shared rules

system/Model.php

@@ -1438,7 +1438,9 @@ public function cleanRules(bool $choice = false)
 	 */
 	public function validate($data): bool
 	{
-		if ($this->skipValidation === true || empty($this->validationRules) || empty($data))
+		$rules = $this->getValidationRules();
+
+		if ($this->skipValidation === true || empty($rules) || empty($data))
 		{
 			return true;
 		}
@@ -1450,8 +1452,6 @@ public function validate($data): bool
 			$data = (array) $data;
 		}
 
-		$rules = $this->validationRules;
-
 		// ValidationRules can be either a string, which is the group name,
 		// or an array of rules.
 		if (is_string($rules))
@@ -1580,6 +1580,13 @@ protected function fillPlaceholders(array $rules, array $data): array
 	public function getValidationRules(array $options = []): array
 	{
 		$rules = $this->validationRules;
+
+		// ValidationRules can be either a string, which is the group name,
+		// or an array of rules.
+		if (is_string($rules))
+		{
+			$rules = $this->validation->loadRuleGroup($rules);
+		}
 
 		if (isset($options['except']))
 		{