Mercurial > hg > cmmr2012-drupal-site
diff core/modules/views_ui/views_ui.theme.inc @ 4:a9cd425dd02b
Update, including to Drupal core 8.6.10
author | Chris Cannam |
---|---|
date | Thu, 28 Feb 2019 13:11:55 +0000 |
parents | c75dbcec494b |
children |
line wrap: on
line diff
--- a/core/modules/views_ui/views_ui.theme.inc Thu Feb 28 11:14:44 2019 +0000 +++ b/core/modules/views_ui/views_ui.theme.inc Thu Feb 28 13:11:55 2019 +0000 @@ -5,7 +5,7 @@ * Preprocessors and theme functions for the Views UI. */ -use Drupal\Component\Utility\SafeMarkup; +use Drupal\Component\Render\FormattableMarkup; use Drupal\Core\Form\FormState; use Drupal\Core\Render\Element; use Drupal\Core\Render\Element\Checkboxes; @@ -158,7 +158,7 @@ 'title' => t('Remove this item'), ], ]), - '#title' => SafeMarkup::format('<span>@text</span>', ['@text' => t('Remove')]), + '#title' => new FormattableMarkup('<span>@text</span>', ['@text' => t('Remove')]), ]; $remove = [$form['group_items'][$group_id]['remove'], $link]; $data = [ @@ -184,7 +184,7 @@ 'action' => 'order', 'relationship' => 'sibling', 'group' => 'weight', - ] + ], ], ]; @@ -286,7 +286,7 @@ $remove_link = [ '#type' => 'link', '#url' => Url::fromRoute('<none>'), - '#title' => SafeMarkup::format('<span>@text</span>', ['@text' => t('Remove')]), + '#title' => new FormattableMarkup('<span>@text</span>', ['@text' => t('Remove')]), '#weight' => '1', '#options' => [ 'attributes' => [ @@ -353,7 +353,7 @@ 'action' => 'order', 'relationship' => 'sibling', 'group' => 'weight', - ] + ], ], ]; }