Merge 80112d79a7 into 81cba4ed4c

code/Control/UserDefinedFormController.php

@@ -662,7 +662,7 @@ EOS;
                 // Hide the step jump button if the FormStep has is initially hidden.
                 // This is particularly important beacause the next/prev page buttons logic is controlled by
                 // the visibility of the FormStep buttons
-                // The HTML for the FormStep buttons is defined in the UserFormProgress template
+                // The HTML for the FormStep buttons is defined in UserFormProgress.ss
                 $id = str_replace('#', '', $target ?? '');
                 $result .= <<<EOS
     $('.step-button-wrapper[data-for="{$id}"]').addClass('hide');

code/FormField/UserFormsCheckboxSetField.php

@@ -12,10 +12,10 @@ class UserFormsCheckboxSetField extends CheckboxSetField
 {
 
     /**
-     * If your project uses a custom UserFormsCheckboxSetField template, ensure that it includes
+     * If your project uses a custom UserFormsCheckboxSetField.ss, ensure that it includes
      * `$Top.getValidationAttributesHTML().RAW` so that custom validation messages work
      * For further details see
-     * templates/SilverStripe/UserForms/FormField/UserFormsCheckboxSetField template
+     * templates/SilverStripe/UserForms/FormField/UserFormsCheckboxSetField.ss
      *
      * Use on a template with .RAW - single and double quoted strings will be safely escaped
      *

code/FormField/UserFormsOptionSetField.php

@@ -12,10 +12,10 @@ class UserFormsOptionSetField extends OptionsetField
 {
 
     /**
-     * If your project uses a custom UserFormsCheckboxSetField template, ensure that it includes
+     * If your project uses a custom UserFormsCheckboxSetField.ss, ensure that it includes
      * `$Top.getValidationAttributesHTML().RAW` so that custom validation messages work
      * For further details see
-     * templates/SilverStripe/UserForms/FormField/UserFormsCheckboxSetField template
+     * templates/SilverStripe/UserForms/FormField/UserFormsCheckboxSetField.ss
      *
      * Use on a template with .RAW - single and double quoted strings will be safely escaped
      *

code/Model/Recipient/EmailRecipient.php

@@ -137,12 +137,6 @@ class EmailRecipient extends DataObject
      */
     private static $allow_unbound_recipient_fields = false;
 
-    /**
-     * The regex used to find template files for rendering emails.
-     * By default this finds ss template files.
-     */
-    private static string $email_template_regex = '/^.*\.ss$/';
-
     public function requireDefaultRecords()
     {
         parent::requireDefaultRecords();
@@ -568,7 +562,7 @@ class EmailRecipient extends DataObject
         $templates = [];
 
         $finder = new FileFinder();
-        $finder->setOption('name_regex', static::config()->get('email_template_regex'));
+        $finder->setOption('name_regex', '/^.*\.ss$/');
 
         $parent = $this->getFormParent();