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

[yaffs-website] / web / core / modules / views_ui / src / Form / Ajax / Rearrange.php

diff --git a/web/core/modules/views_ui/src/Form/Ajax/Rearrange.php b/web/core/modules/views_ui/src/Form/Ajax/Rearrange.php
index 6f6834d09881b28b02502a8ae4d7a208a2a7e83a..c904ff374e8dc601e406ab4341ff74242fb0f186 100644 (file)
--- a/web/core/modules/views_ui/src/Form/Ajax/Rearrange.php
+++ b/web/core/modules/views_ui/src/Form/Ajax/Rearrange.php
@@ -2,7 +2,7 @@
 
 namespace Drupal\views_ui\Form\Ajax;
 
-use Drupal\Component\Utility\SafeMarkup;
+use Drupal\Component\Render\FormattableMarkup;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Url;
 use Drupal\views\ViewEntityInterface;
@@ -85,7 +85,7 @@ class Rearrange extends ViewsFormBase {
           'action' => 'order',
           'relationship' => 'sibling',
           'group' => 'weight',
-        ]
+        ],
       ],
       '#tree' => TRUE,
       '#prefix' => '<div class="scroll" data-drupal-views-scroll>',
@@ -126,7 +126,7 @@ class Rearrange extends ViewsFormBase {
         '#id' => 'views-removed-' . $id,
         '#attributes' => ['class' => ['views-remove-checkbox']],
         '#default_value' => 0,
-        '#suffix' => \Drupal::l(SafeMarkup::format('<span>@text</span>', ['@text' => $this->t('Remove')]),
+        '#suffix' => \Drupal::l(new FormattableMarkup('<span>@text</span>', ['@text' => $this->t('Remove')]),
           Url::fromRoute('<none>', [], [
             'attributes' => [
               'id' => 'views-remove-link-' . $id,