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

[yaffs-website] / web / core / includes / tablesort.inc

diff --git a/web/core/includes/tablesort.inc b/web/core/includes/tablesort.inc
index b948fea69ef87803b98fe1fba939724efbf1c726..ee5086900629125a23c4145e6fb672edf8dce313 100644 (file)
--- a/web/core/includes/tablesort.inc
+++ b/web/core/includes/tablesort.inc
@@ -9,7 +9,7 @@
  * column.
  */
 
-use Drupal\Component\Utility\SafeMarkup;
+use Drupal\Component\Render\FormattableMarkup;
 use Drupal\Core\Url;
 use Drupal\Component\Utility\UrlHelper;
 
@@ -60,7 +60,7 @@ function tablesort_header(&$cell_content, array &$cell_attributes, array $header
       $ts['sort'] = 'asc';
       $image = '';
     }
-    $cell_content = \Drupal::l(SafeMarkup::format('@cell_content@image', ['@cell_content' => $cell_content, '@image' => $image]), new Url('<current>', [], [
+    $cell_content = \Drupal::l(new FormattableMarkup('@cell_content@image', ['@cell_content' => $cell_content, '@image' => $image]), new Url('<current>', [], [
       'attributes' => ['title' => $title],
       'query' => array_merge($ts['query'], [
         'sort' => $ts['sort'],