Added the Search API Synonym module to deal specifically with licence and license...

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

diff --git a/web/core/includes/tablesort.inc b/web/core/includes/tablesort.inc
index d8f16243138b677045db9eca8102127df74b7b9f..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;
 
@@ -53,14 +53,14 @@ function tablesort_header(&$cell_content, array &$cell_attributes, array $header
         '#theme' => 'tablesort_indicator',
         '#style' => $ts['sort'],
       ];
-      $image = drupal_render($tablesort_indicator);
+      $image = \Drupal::service('renderer')->render($tablesort_indicator);
     }
     else {
       // If the user clicks a different header, we want to sort ascending initially.
       $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'],