Merge branch '3.0' into 3

silverstripe · Jan 14, 2025 · 095d4a7 · 095d4a7
2 parents 1cf176b + ee61bd5
commit 095d4a7
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/RestoreAction.php b/src/RestoreAction.php
@@ -2,6 +2,7 @@
 
 namespace SilverStripe\Versioned;
 
+use SilverStripe\Core\Convert;
 use SilverStripe\ORM\Hierarchy\Hierarchy;
 use SilverStripe\Core\Validation\ValidationException;
 use SilverStripe\Versioned\Versioned;
@@ -86,7 +87,7 @@ public static function restore($item)
     public static function getRestoreMessage($originalItem, $restoredItem, $changedLocation = false)
     {
         $restoredID = $restoredItem->Title ?: $restoredItem->ID;
-        $restoredType = strtolower($restoredItem->i18n_singular_name() ?? '');
+        $restoredType = Convert::raw2xml(strtolower($restoredItem->i18n_singular_name() ?? ''));
 
         $editLink = $restoredItem->CMSEditLink();
         if ($editLink) {

diff --git a/src/VersionedGridFieldItemRequest.php b/src/VersionedGridFieldItemRequest.php
@@ -104,8 +104,8 @@ public function doArchive($data, $form)
             __CLASS__ . '.Archived',
             'Archived {name} "{title}"',
             [
-                'name' => $record->i18n_singular_name(),
-                'title' => $title
+                'name' => Convert::raw2xml($record->i18n_singular_name()),
+                'title' => Convert::raw2xml($title)
             ]
         );
         $this->setFormMessage($form, $message);
@@ -146,7 +146,7 @@ public function doPublish($data, $form)
             __CLASS__ . '.Published',
             'Published {name} {link}',
             [
-                'name' => $record->i18n_singular_name(),
+                'name' => Convert::raw2xml($record->i18n_singular_name()),
                 'link' => $link
             ]
         );
@@ -190,8 +190,8 @@ public function doUnpublish($data, $form)
             __CLASS__ . '.Unpublished',
             'Unpublished {name} "{title}"',
             [
-                'name' => $record->i18n_singular_name(),
-                'title' => $title
+                'name' => Convert::raw2xml($record->i18n_singular_name()),
+                'title' => Convert::raw2xml($title)
             ]
         );
         $this->setFormMessage($form, $message);