Skip to content

Beautiful Open-Source Form Builder

Fix validation for existing forms

Julien Nahum530f05d22833
diff --git a/app/Rules/CustomFieldValidationRule.php b/app/Rules/CustomFieldValidationRule.php
index a4b2598ba..f31823640 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
+ );
}
/**