diff --git a/core/modules/filter/src/Plugin/Filter/FilterCaption.php b/core/modules/filter/src/Plugin/Filter/FilterCaption.php
index b68e6d3..da99f62 100644
--- a/core/modules/filter/src/Plugin/Filter/FilterCaption.php
+++ b/core/modules/filter/src/Plugin/Filter/FilterCaption.php
@@ -60,7 +60,7 @@ public function process($text, $langcode) {
$node->removeAttribute('class');
$filter_caption = array(
'#theme' => 'filter_caption',
- '#node' => SafeMarkup::set($node->C14N()),
+ '#node' => $node->C14N(),
'#tag' => $node->tagName,
'#caption' => $caption,
'#classes' => $classes,
diff --git a/core/modules/node/node.install b/core/modules/node/node.install
index b7baab8..276e2ea 100644
--- a/core/modules/node/node.install
+++ b/core/modules/node/node.install
@@ -32,7 +32,7 @@ function node_requirements($phase) {
'value' => $value,
// The result of t() is safe and so is the result of l(). Preserving
// safe object.
- 'description' => SafeMarkup::set($description . ' ' . \Drupal::l(t('Rebuild permissions'), new Url('node.configure_rebuild_confirm'))),
+ 'description' => $description . ' ' . \Drupal::l(t('Rebuild permissions'), new Url('node.configure_rebuild_confirm')),
);
}
return $requirements;
diff --git a/core/modules/node/src/Plugin/Search/NodeSearch.php b/core/modules/node/src/Plugin/Search/NodeSearch.php
index 83140c1..d2b9a50 100644
--- a/core/modules/node/src/Plugin/Search/NodeSearch.php
+++ b/core/modules/node/src/Plugin/Search/NodeSearch.php
@@ -307,10 +307,8 @@ protected function prepareResults(StatementInterface $found) {
unset($build['#theme']);
// Fetch comment count for snippet.
- $node->rendered = SafeMarkup::set(
- drupal_render($build) . ' ' .
- SafeMarkup::escape($this->moduleHandler->invoke('comment', 'node_update_index', array($node, $item->langcode)))
- );
+ $node->rendered = drupal_render($build) . ' ' .
+ SafeMarkup::escape($this->moduleHandler->invoke('comment', 'node_update_index', array($node, $item->langcode)));
$extra = $this->moduleHandler->invokeAll('node_search_result', array($node, $item->langcode));
diff --git a/core/modules/node/src/Plugin/views/row/Rss.php b/core/modules/node/src/Plugin/views/row/Rss.php
index 55d62a5..27c720c 100644
--- a/core/modules/node/src/Plugin/views/row/Rss.php
+++ b/core/modules/node/src/Plugin/views/row/Rss.php
@@ -159,7 +159,7 @@ public function render($row) {
}
$item = new \stdClass();
- $item->description = SafeMarkup::set($item_text);
+ $item->description = $item_text;
$item->title = $node->label();
$item->link = $node->link;
$item->elements = $node->rss_elements;
diff --git a/core/modules/rdf/rdf.module b/core/modules/rdf/rdf.module
index 50b6f36..acf87bc 100644
--- a/core/modules/rdf/rdf.module
+++ b/core/modules/rdf/rdf.module
@@ -461,8 +461,8 @@ function rdf_preprocess_comment(&$variables) {
$created_metadata_markup = drupal_render($rdf_metadata);
// Appends the markup to the created variable and the submitted variable
// which are both available in comment.html.twig.
- $variables['created'] = SafeMarkup::set(SafeMarkup::escape($variables['created']) . $created_metadata_markup);
- $variables['submitted'] = SafeMarkup::set($variables['submitted'] . $created_metadata_markup);
+ $variables['created'] = SafeMarkup::escape($variables['created']) . $created_metadata_markup;
+ $variables['submitted'] = $variables['submitted'] . $created_metadata_markup;
}
$title_mapping = $mapping->getPreparedFieldMapping('subject');
if (!empty($title_mapping)) {
diff --git a/core/modules/search/tests/modules/search_embedded_form/search_embedded_form.module b/core/modules/search/tests/modules/search_embedded_form/search_embedded_form.module
index 75ddd3d..f9ea49f 100644
--- a/core/modules/search/tests/modules/search_embedded_form/search_embedded_form.module
+++ b/core/modules/search/tests/modules/search_embedded_form/search_embedded_form.module
@@ -16,5 +16,5 @@
*/
function search_embedded_form_preprocess_search_result(&$variables) {
$form = \Drupal::formBuilder()->getForm('Drupal\search_embedded_form\Form\SearchEmbeddedForm');
- $variables['snippet'] = SafeMarkup::set(SafeMarkup::escape($variables['snippet']) . drupal_render($form));
+ $variables['snippet'] = SafeMarkup::escape($variables['snippet']) . drupal_render($form);
}
diff --git a/core/modules/system/system.admin.inc b/core/modules/system/system.admin.inc
index ce7dba8..d772e63 100644
--- a/core/modules/system/system.admin.inc
+++ b/core/modules/system/system.admin.inc
@@ -230,7 +230,7 @@ function theme_system_modules_details($variables) {
// Add the module label and expand/collapse functionalty.
$id = Html::getUniqueId('module-' . $key);
$col2 = '';
- $row[] = array('class' => array('module'), 'data' => SafeMarkup::set($col2));
+ $row[] = array('class' => array('module'), 'data' => $col2);
// Add the description, along with any modules it requires.
$description = '';
@@ -259,7 +259,7 @@ function theme_system_modules_details($variables) {
}
$details = array(
'#type' => 'details',
- '#title' => SafeMarkup::set(' ' . drupal_render($module['description']) . ''),
+ '#title' => ' ' . drupal_render($module['description']) . '',
'#attributes' => array('id' => $module['enable']['#id'] . '-description'),
'#description' => $description,
);
diff --git a/core/modules/system/system.install b/core/modules/system/system.install
index 4a8683e..16e6ab5 100644
--- a/core/modules/system/system.install
+++ b/core/modules/system/system.install
@@ -61,7 +61,7 @@ function system_requirements($phase) {
$requirements['php'] = array(
'title' => t('PHP'),
// $phpversion is safe and output of l() is safe, so this value is safe.
- 'value' => SafeMarkup::set(($phase == 'runtime') ? $phpversion . ' (' . \Drupal::l(t('more information'), new Url('system.php')) . ')' : $phpversion),
+ 'value' => ($phase == 'runtime') ? $phpversion . ' (' . \Drupal::l(t('more information'), new Url('system.php')) . ')' : $phpversion,
);
}
else {
@@ -352,7 +352,7 @@ function system_requirements($phase) {
// output, whitespace, and
tags, so is safe. However, as a best
// practice, we should not use SafeMarkup::set() around a variable. Fix
// in: https://www.drupal.org/node/2296929
- 'description' => SafeMarkup::set($description),
+ 'description' => $description,
);
}
if ($phase != 'install') {
diff --git a/core/modules/system/tests/modules/batch_test/batch_test.callbacks.inc b/core/modules/system/tests/modules/batch_test/batch_test.callbacks.inc
index 6fc9a8d..a8fe7a9 100644
--- a/core/modules/system/tests/modules/batch_test/batch_test.callbacks.inc
+++ b/core/modules/system/tests/modules/batch_test/batch_test.callbacks.inc
@@ -102,7 +102,7 @@ function _batch_test_finished_helper($batch_id, $success, $results, $operations)
$messages[] = t('An error occurred while processing @op with arguments:
@args', array('@op' => $error_operation[0], '@args' => print_r($error_operation[1], TRUE)));
}
- drupal_set_message(SafeMarkup::set(implode('
', $messages)));
+ drupal_set_message(implode('
', $messages));
}
/**
diff --git a/core/modules/views/src/Plugin/views/style/Rss.php b/core/modules/views/src/Plugin/views/style/Rss.php
index fbbf4dd..b5c60b1 100644
--- a/core/modules/views/src/Plugin/views/style/Rss.php
+++ b/core/modules/views/src/Plugin/views/style/Rss.php
@@ -133,7 +133,7 @@ public function render() {
'#theme' => $this->themeFunctions(),
'#view' => $this->view,
'#options' => $this->options,
- '#rows' => SafeMarkup::set($rows),
+ '#rows' => $rows,
);
unset($this->view->row_index);
return $build;
diff --git a/core/modules/views/views.theme.inc b/core/modules/views/views.theme.inc
index a9b6295..91acd17 100644
--- a/core/modules/views/views.theme.inc
+++ b/core/modules/views/views.theme.inc
@@ -481,7 +481,7 @@ function template_preprocess_views_view_table(&$variables) {
'#style' => $initial,
);
$markup = drupal_render($tablesort_indicator);
- $label = SafeMarkup::set($label . $markup);
+ $label = $label . $markup;
}
$query['order'] = $field;
@@ -582,7 +582,7 @@ function template_preprocess_views_view_table(&$variables) {
if (!empty($options['info'][$column]['separator'])) {
$safe_content = SafeMarkup::escape($column_reference['content']);
$safe_separator = Xss::filterAdmin($options['info'][$column]['separator']);
- $column_reference['content'] = SafeMarkup::set($safe_content . $safe_separator);
+ $column_reference['content'] = $safe_content . $safe_separator;
}
}
else {
@@ -590,7 +590,7 @@ function template_preprocess_views_view_table(&$variables) {
}
$safe_content = SafeMarkup::escape($column_reference['content']);
$safe_field_output = SafeMarkup::escape($field_output);
- $column_reference['content'] = SafeMarkup::set($safe_content . $safe_field_output);
+ $column_reference['content'] = $safe_content . $safe_field_output;
}
}
$column_reference['attributes'] = new Attribute($column_reference['attributes']);