Updated Drupal to 8.6. This goes with the following updates because it's possible...

[yaffs-website] / web / core / modules / views_ui / views_ui.theme.inc

diff --git a/web/core/modules/views_ui/views_ui.theme.inc b/web/core/modules/views_ui/views_ui.theme.inc
index d1aef4c46c4a1cd31a46bfc7b0e0438acf0613c3..69eff489fc4f80fe0e64d2b6482a6a52ed97b7cf 100644 (file)
--- 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',
-        ]
+        ],
       ],
     ];
   }