From 530f05d22833248cac9896f2de0fa929ce399e31 Mon Sep 17 00:00:00 2001 From: Julien Nahum Date: Wed, 29 May 2024 16:54:26 +0200 Subject: [PATCH] Fix validation for existing forms --- app/Rules/CustomFieldValidationRule.php | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/app/Rules/CustomFieldValidationRule.php b/app/Rules/CustomFieldValidationRule.php index a4b2598b..f3182364 100644 --- a/app/Rules/CustomFieldValidationRule.php +++ b/app/Rules/CustomFieldValidationRule.php @@ -19,13 +19,21 @@ class CustomFieldValidationRule implements Rule /** * Determine if the validation rule passes. * - * @param string $attribute - * @param mixed $value + * @param string $attribute + * @param mixed $value * @return bool */ public function passes($attribute, $value) { - return FormLogicConditionChecker::conditionsMet($this->validation['error_conditions']['conditions'], $this->formData); + if (!($this->validation['error_conditions']['conditions'] ?? null) || is_null( + $this->validation['error_conditions']['conditions'] ?? null + )) { + return true; + } + return FormLogicConditionChecker::conditionsMet( + $this->validation['error_conditions']['conditions'], + $this->formData + ); } /**