ENH Suppress deprecation notices for API we can't avoid

silverstripe · Oct 14, 2024 · 126e672 · 126e672
1 parent 7466999
commit 126e672
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/code/Control/UserDefinedFormController.php b/code/Control/UserDefinedFormController.php
@@ -14,6 +14,7 @@
 use SilverStripe\Control\HTTPResponse;
 use SilverStripe\Core\Injector\Injector;
 use SilverStripe\Core\Manifest\ModuleLoader;
+use SilverStripe\Dev\Deprecation;
 use SilverStripe\Forms\Form;
 use SilverStripe\i18n\i18n;
 use SilverStripe\ORM\ArrayList;
@@ -421,7 +422,9 @@ public function process($data, $form)
                 // Include any parsed merge field references from the CMS editor - this is already escaped
                 // This string substitution works for both HTML and plain text emails.
                 // $recipient->getEmailBodyContent() will retrieve the relevant version of the email
-                $emailData['Body'] = SSViewer::execute_string($recipient->getEmailBodyContent(), $mergeFields);
+                $emailData['Body'] = Deprecation::withSuppressedNotice(
+                    fn () => SSViewer::execute_string($recipient->getEmailBodyContent(), $mergeFields)
+                );
                 // only include visible fields if recipient visibility flag is set
                 if ((bool) $recipient->HideInvisibleFields) {
                     $emailData['Fields'] = $visibleSubmittedFields;
@@ -487,10 +490,14 @@ public function process($data, $form)
                     if ($submittedFormField && trim($submittedFormField->Value ?? '')) {
                         $email->setSubject($submittedFormField->Value);
                     } else {
-                        $email->setSubject(SSViewer::execute_string($recipient->EmailSubject, $mergeFields));
+                        $email->setSubject(Deprecation::withSuppressedNotice(
+                            fn () => SSViewer::execute_string($recipient->EmailSubject, $mergeFields)
+                        ));
                     }
                 } else {
-                    $email->setSubject(SSViewer::execute_string($recipient->EmailSubject, $mergeFields));
+                    $email->setSubject(Deprecation::withSuppressedNotice(
+                        fn () => SSViewer::execute_string($recipient->EmailSubject, $mergeFields)
+                    ));
                 }
 
                 $this->extend('updateEmail', $email, $recipient, $emailData);