X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs-website;a=blobdiff_plain;f=web%2Fcore%2Fmodules%2Fviews_ui%2Fviews_ui.theme.inc;fp=web%2Fcore%2Fmodules%2Fviews_ui%2Fviews_ui.theme.inc;h=69eff489fc4f80fe0e64d2b6482a6a52ed97b7cf;hp=d1aef4c46c4a1cd31a46bfc7b0e0438acf0613c3;hb=0bf8d09d2542548982e81a441b1f16e75873a04f;hpb=74df008bdbb3a11eeea356744f39b802369bda3c

diff --git a/web/core/modules/views_ui/views_ui.theme.inc b/web/core/modules/views_ui/views_ui.theme.inc
index d1aef4c46..69eff489f 100644
--- a/web/core/modules/views_ui/views_ui.theme.inc
+++ b/web/core/modules/views_ui/views_ui.theme.inc
@@ -5,7 +5,7 @@
  * Preprocessors and theme functions for the Views UI.
  */
 
-use Drupal\Component\Utility\SafeMarkup;
+use Drupal\Component\Render\FormattableMarkup;
 use Drupal\Core\Form\FormState;
 use Drupal\Core\Render\Element;
 use Drupal\Core\Render\Element\Checkboxes;
@@ -158,7 +158,7 @@ function template_preprocess_views_ui_build_group_filter_form(&$variables) {
           'title' => t('Remove this item'),
         ],
       ]),
-      '#title' => SafeMarkup::format('<span>@text</span>', ['@text' => t('Remove')]),
+      '#title' => new FormattableMarkup('<span>@text</span>', ['@text' => t('Remove')]),
     ];
     $remove = [$form['group_items'][$group_id]['remove'], $link];
     $data = [
@@ -184,7 +184,7 @@ function template_preprocess_views_ui_build_group_filter_form(&$variables) {
         'action' => 'order',
         'relationship' => 'sibling',
         'group' => 'weight',
-      ]
+      ],
     ],
   ];
 
@@ -286,7 +286,7 @@ function template_preprocess_views_ui_rearrange_filter_form(&$variables) {
         $remove_link = [
           '#type' => 'link',
           '#url' => Url::fromRoute('<none>'),
-          '#title' => SafeMarkup::format('<span>@text</span>', ['@text' => t('Remove')]),
+          '#title' => new FormattableMarkup('<span>@text</span>', ['@text' => t('Remove')]),
           '#weight' => '1',
           '#options' => [
             'attributes' => [
@@ -353,7 +353,7 @@ function template_preprocess_views_ui_rearrange_filter_form(&$variables) {
           'action' => 'order',
           'relationship' => 'sibling',
           'group' => 'weight',
-        ]
+        ],
       ],
     ];
   }