Merge branch '7.0' into 7

silverstripe · Dec 13, 2024 · bc2d7d6 · bc2d7d6
2 parents 861eb20 + 2efc5ea
commit bc2d7d6
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 16 deletions.
diff --git a/code/Form/UserFormsRequiredFieldsValidator.php b/code/Form/UserFormsRequiredFieldsValidator.php
@@ -35,12 +35,6 @@ public function php($data)
         $valid = true;
         $fields = $this->form->Fields();
 
-        foreach ($fields as $field) {
-            $result = $field->validate();
-            $valid = $result->isValid() && $valid;
-            $this->result->combineAnd($result);
-        }
-
         if (empty($this->required)) {
             return $valid;
         }

diff --git a/code/Model/Recipient/EmailRecipient.php b/code/Model/Recipient/EmailRecipient.php
@@ -229,15 +229,7 @@ protected function getFormParent()
             $formClass = $this->FormClass;
             return $formClass::get()->byID($this->FormID);
         }
-
-        // Revert to checking for a form from the session
-        // LeftAndMain::sessionNamespace is protected.
-        $sessionNamespace = $this->config()->get('session_namespace') ?: CMSMain::class;
-
-        $formID = Controller::curr()->getRequest()->getSession()->get($sessionNamespace . '.currentPage');
-        if ($formID) {
-            return UserDefinedForm::get()->byID($formID);
-        }
+        return null;
     }
 
     public function getTitle()

diff --git a/code/Model/UserDefinedForm.php b/code/Model/UserDefinedForm.php
@@ -20,7 +20,7 @@ class UserDefinedForm extends Page
      * @var string
      * @deprecated 6.4.0 Will be renamed to cms_icon_class
      */
-    private static $icon_class = 'font-icon-p-list';
+    private static $cms_icon_class = 'font-icon-p-list';
 
     private static $class_description = 'Adds a customizable form.';