Merge pull request tractorcow-farm#921 from tractorcow-farm/7.2

Merge 7.2 into 7
silverstripe-terraformers · Jan 14, 2025 · 7a04530 · 7a04530
2 parents 19d9b1c + 43e2ab9
commit 7a04530
Showing 1 changed file with 11 additions and 10 deletions.
diff --git a/src/Extension/Traits/FluentAdminTrait.php b/src/Extension/Traits/FluentAdminTrait.php
@@ -5,6 +5,7 @@
 use SilverStripe\CMS\Model\SiteTree;
 use SilverStripe\Control\HTTPResponse;
 use SilverStripe\Control\HTTPResponse_Exception;
+use SilverStripe\Core\Convert;
 use SilverStripe\Forms\FieldList;
 use SilverStripe\Forms\Form;
 use SilverStripe\Forms\FormAction;
@@ -263,7 +264,7 @@ public function clearFluent($data, $form)
         $message = _t(
             'TractorCow\Fluent\Extension\Traits\FluentAdminTrait.ClearAllNotice',
             "All localisations have been cleared for '{title}'.",
-            ['title' => $record->Title]
+            ['title' => Convert::raw2xml($record->Title)]
         );
 
         $record->flushCache(true);
@@ -309,7 +310,7 @@ public function copyFluent($data, $form)
         $message = _t(
             'TractorCow\Fluent\Extension\Traits\FluentAdminTrait.CopyNotice',
             "Copied '{title}' to all other locales.",
-            ['title' => $record->Title]
+            ['title' => Convert::raw2xml($record->Title)]
         );
 
         $record->flushCache(true);
@@ -343,7 +344,7 @@ public function unpublishFluent($data, $form)
         $message = _t(
             'TractorCow\Fluent\Extension\Traits\FluentAdminTrait.UnpublishNotice',
             "Unpublished '{title}' from all locales.",
-            ['title' => $record->Title]
+            ['title' => Convert::raw2xml($record->Title)]
         );
 
         $record->flushCache(true);
@@ -393,7 +394,7 @@ public function archiveFluent($data, $form)
         $message = _t(
             'TractorCow\Fluent\Extension\Traits\FluentAdminTrait.ArchiveNotice',
             "Archived '{title}' and all of its localisations.",
-            ['title' => $record->Title]
+            ['title' => Convert::raw2xml($record->Title)]
         );
 
         $record->flushCache(true);
@@ -441,7 +442,7 @@ public function deleteFluent($data, $form)
         $message = _t(
             'TractorCow\Fluent\Extension\Traits\FluentAdminTrait.DeleteNotice',
             "Deleted '{title}' and all of its localisations.",
-            ['title' => $record->Title]
+            ['title' => Convert::raw2xml($record->Title)]
         );
 
         $record->flushCache(true);
@@ -485,7 +486,7 @@ public function publishFluent($data, $form)
         $message = _t(
             'TractorCow\Fluent\Extension\Traits\FluentAdminTrait.PublishNotice',
             "Published '{title}' across all locales.",
-            ['title' => $record->Title]
+            ['title' => Convert::raw2xml($record->Title)]
         );
 
         $record->flushCache(true);
@@ -516,8 +517,8 @@ public function showFluent($data, $form)
             'TractorCow\Fluent\Extension\Traits\FluentAdminTrait.ShowNotice',
             "Record '{title}' is now visible in {locale}",
             [
-                'title'  => $record->Title,
-                'locale' => $locale->Title
+                'title'  => Convert::raw2xml($record->Title),
+                'locale' => Convert::raw2xml($locale->Title),
             ]
         );
 
@@ -549,8 +550,8 @@ public function hideFluent($data, $form)
             'TractorCow\Fluent\Extension\Traits\FluentAdminTrait.HideNotice',
             "Record '{title}' is now hidden in {locale}",
             [
-                'title'  => $record->Title,
-                'locale' => $locale->Title
+                'title'  => Convert::raw2xml($record->Title),
+                'locale' => Convert::raw2xml($locale->Title),
             ]
         );