comparison core/includes/tablesort.inc @ 4:a9cd425dd02b

Update, including to Drupal core 8.6.10

  * All tables created when rendering a '#type' => 'table' have the option of
  * having column headers that the user can click on to sort the table by that
  * column.
  */
 
-use Drupal\Component\Utility\SafeMarkup;
+use Drupal\Component\Render\FormattableMarkup;
 use Drupal\Core\Url;
 use Drupal\Component\Utility\UrlHelper;
 
 /**
  * Initializes the table sort context.

     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'],
         'order' => $cell_content,
       ]),