Allow forcing validation via the public property

octobercms · Mar 7, 2024 · 84bf798 · 84bf798
1 parent ea3fa78
commit 84bf798
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/Database/Traits/Validation.php b/src/Database/Traits/Validation.php
@@ -70,18 +70,24 @@ public function initializeValidation()
         }
 
         $this->bindEvent('model.saveInternal', function() {
+            $validationForced = $this->validationForced;
+
+            if (($forceOption = $this->getSaveOption('force')) !== null) {
+                $this->validationForced = $forceOption;
+            }
+
             // If forcing the save event, the beforeValidate/afterValidate
             // events should still fire for consistency. So validate an
             // empty set of rules and messages.
-            $this->validationForced = $this->getSaveOption('force', false);
-
             if ($this->validationForced) {
                 $valid = $this->validate([], []);
             }
             else {
                 $valid = $this->validate();
             }
 
+            $this->validationForced = $validationForced;
+
             if (!$valid) {
                 return false;
             }