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 / ReorderDisplays.php

diff --git a/web/core/modules/views_ui/src/Form/Ajax/ReorderDisplays.php b/web/core/modules/views_ui/src/Form/Ajax/ReorderDisplays.php
index c9ad4136412915993d147a966a9fac8fad0060cd..7e5f83f7f503682e561cb1bb9e67fb30c643abfc 100644 (file)
--- a/web/core/modules/views_ui/src/Form/Ajax/ReorderDisplays.php
+++ b/web/core/modules/views_ui/src/Form/Ajax/ReorderDisplays.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;
 
@@ -44,7 +44,7 @@ class ReorderDisplays extends ViewsFormBase {
     ]);
     $form['view'] = [
       '#type' => 'value',
-      '#value' => $view
+      '#value' => $view,
     ];
 
     $displays = $view->get('display');
@@ -68,7 +68,7 @@ class ReorderDisplays extends ViewsFormBase {
           'action' => 'order',
           'relationship' => 'sibling',
           'group' => 'weight',
-        ]
+        ],
       ],
       '#tree' => TRUE,
       '#prefix' => '<div class="scroll" data-drupal-views-scroll>',
@@ -117,7 +117,7 @@ class ReorderDisplays extends ViewsFormBase {
         ],
         'link' => [
           '#type' => 'link',
-          '#title' => SafeMarkup::format('<span>@text</span>', ['@text' => $this->t('Remove')]),
+          '#title' => new FormattableMarkup('<span>@text</span>', ['@text' => $this->t('Remove')]),
           '#url' => Url::fromRoute('<none>'),
           '#attributes' => [
             'id' => 'display-remove-link-' . $id,