diff --git a/core/includes/common.inc b/core/includes/common.inc
index 29a645a19d81c46a1aeba6bd186a0b9a1f1a06aa..037c5b0f44878a23b8dec2bc22066e0dc3b599ac 100644
--- a/core/includes/common.inc
+++ b/core/includes/common.inc
@@ -896,7 +896,7 @@ function drupal_render_children(&$element, $children_keys = NULL) {
$output = '';
foreach ($children_keys as $key) {
if (!empty($element[$key])) {
- $output .= \Drupal::service('bare_html_page_renderer')->render($element[$key]);
+ $output .= drupal_render($element[$key]);
}
}
return Markup::create($output);
diff --git a/core/includes/tablesort.inc b/core/includes/tablesort.inc
index 48b7fcece69ee6e5c8dfa87e4737befb622cfa44..95642b386925f51ba5ee3a3fcd16a7c1e1ddba88 100644
--- a/core/includes/tablesort.inc
+++ b/core/includes/tablesort.inc
@@ -53,7 +53,7 @@ function tablesort_header(&$cell_content, array &$cell_attributes, array $header
'#theme' => 'tablesort_indicator',
'#style' => $ts['sort'],
);
- $image = \Drupal::service('renderer')->render($tablesort_indicator);
+ $image = drupal_render($tablesort_indicator);
}
else {
// If the user clicks a different header, we want to sort ascending initially.
diff --git a/core/lib/Drupal/Core/Form/form.api.php b/core/lib/Drupal/Core/Form/form.api.php
index b36302ee690059a76f7566427a775c29f434185b..701871f9299300840321391d08f39002d9eae264 100644
--- a/core/lib/Drupal/Core/Form/form.api.php
+++ b/core/lib/Drupal/Core/Form/form.api.php
@@ -120,7 +120,7 @@ function callback_batch_finished($success, $results, $operations) {
'#theme' => 'item_list',
'#items' => $results,
);
- $message .= \Drupal::service('renderer')->render($list);
+ $message .= drupal_render($list);
drupal_set_message($message);
}
else {
diff --git a/core/lib/Drupal/Core/Menu/menu.api.php b/core/lib/Drupal/Core/Menu/menu.api.php
index a7b40142af6145ba0cfbe415aa072cdc172988bb..f522d3ab8b387696d38663984dee7fa896ec98bc 100644
--- a/core/lib/Drupal/Core/Menu/menu.api.php
+++ b/core/lib/Drupal/Core/Menu/menu.api.php
@@ -201,7 +201,7 @@
* // Finally, build a renderable array from the transformed tree.
* $menu = $menu_tree->build($tree);
*
- * $menu_html = \Drupal::service('renderer')->render($menu);
+ * $menu_html = drupal_render($menu);
* @endcode
*
* @}
diff --git a/core/lib/Drupal/Core/Render/Element/Tableselect.php b/core/lib/Drupal/Core/Render/Element/Tableselect.php
index 8019eba6e3a96e200860de38efaa2dbbdb56b138..faa288e47434e0766b67d7cdb6ef05c467cab94e 100644
--- a/core/lib/Drupal/Core/Render/Element/Tableselect.php
+++ b/core/lib/Drupal/Core/Render/Element/Tableselect.php
@@ -159,7 +159,7 @@ public static function preRenderTableselect($element) {
$row += $element['#options'][$key]['#attributes'];
}
// Render the checkbox / radio element.
- $row['data'][] = \Drupal::service('renderer')->render($element[$key]);
+ $row['data'][] = drupal_render($element[$key]);
// As table.html.twig only maps header and row columns by order, create
// the correct order by iterating over the header fields.
diff --git a/core/lib/Drupal/Core/Theme/ThemeManager.php b/core/lib/Drupal/Core/Theme/ThemeManager.php
index dbe2715e636fc18d2f17035aa04f34c59900f38f..ed18039f7d4a04837d38df4bb4d08ac6ae6369bc 100644
--- a/core/lib/Drupal/Core/Theme/ThemeManager.php
+++ b/core/lib/Drupal/Core/Theme/ThemeManager.php
@@ -303,7 +303,7 @@ public function render($hook, array $variables) {
unset($preprocess_bubbleable['#cache']['keys']);
if ($preprocess_bubbleable) {
// @todo Inject the Renderer in https://www.drupal.org/node/2529438.
- \Drupal::service('renderer')->render($preprocess_bubbleable);
+ drupal_render($preprocess_bubbleable);
}
}
diff --git a/core/lib/Drupal/Core/Utility/token.api.php b/core/lib/Drupal/Core/Utility/token.api.php
index 60e17b5f2b6b5c453cbaaf3c1cd6f33fd2c634f9..56d8f3a5fb8a58e29095eacd7d4cbe295d764bbf 100644
--- a/core/lib/Drupal/Core/Utility/token.api.php
+++ b/core/lib/Drupal/Core/Utility/token.api.php
@@ -166,7 +166,7 @@ function hook_tokens_alter(array &$replacements, array $context, \Drupal\Core\Re
// of a field (field_title).
if (isset($context['tokens']['title'])) {
$title = $node->field_title->view('default');
- $replacements[$context['tokens']['title']] = \Drupal::service('renderer')->render($title);
+ $replacements[$context['tokens']['title']] = drupal_render($title);
}
}
}
diff --git a/core/modules/action/action.views_execution.inc b/core/modules/action/action.views_execution.inc
index 8dbf5b398ea4daa38426447326fb37609583f93e..5b4f71f8116bb020c78057266f1744ad43dbe77a 100644
--- a/core/modules/action/action.views_execution.inc
+++ b/core/modules/action/action.views_execution.inc
@@ -15,6 +15,6 @@ function action_views_form_substitutions() {
'#attributes' => array('class' => array('action-table-select-all')),
);
return array(
- '<!--action-bulk-form-select-all-->' => \Drupal::service('renderer')->render($select_all),
+ '<!--action-bulk-form-select-all-->' => drupal_render($select_all),
);
}
diff --git a/core/modules/book/book.module b/core/modules/book/book.module
index 2b10b6878ecfd4bba4e28901ebd5166038dc6837..ecccb7452720dac3732a7d00784b9cb61d44f501 100644
--- a/core/modules/book/book.module
+++ b/core/modules/book/book.module
@@ -437,7 +437,7 @@ function template_preprocess_book_navigation(&$variables) {
}
if (!empty($build)) {
- \Drupal::service('renderer')->render($build);
+ drupal_render($build);
}
$variables['has_links'] = FALSE;
diff --git a/core/modules/book/src/Form/BookAdminEditForm.php b/core/modules/book/src/Form/BookAdminEditForm.php
index b18a7f53f9f8fcf893912b152762906d9a663fdb..175394422f2fcdc6e6b254c9f91d9030744c6c4b 100644
--- a/core/modules/book/src/Form/BookAdminEditForm.php
+++ b/core/modules/book/src/Form/BookAdminEditForm.php
@@ -220,7 +220,7 @@ protected function bookAdminTableTree(array $tree, array &$form) {
}
$form[$id]['title'] = [
- '#prefix' => !empty($indentation) ? \Drupal::service('renderer')->render($indentation) : '',
+ '#prefix' => !empty($indentation) ? drupal_render($indentation) : '',
'#type' => 'textfield',
'#default_value' => $data['link']['title'],
'#maxlength' => 255,
diff --git a/core/modules/comment/comment.module b/core/modules/comment/comment.module
index 8230193018bd8cdd1130cdb51798f309c8ffb6cf..b0f1550c7e518d242ccd4143385824cf6d83cf1e 100644
--- a/core/modules/comment/comment.module
+++ b/core/modules/comment/comment.module
@@ -631,7 +631,7 @@ function template_preprocess_comment(&$variables) {
'#theme' => 'username',
'#account' => $account,
);
- $variables['author'] = \Drupal::service('renderer')->render($username);
+ $variables['author'] = drupal_render($username);
$variables['author_id'] = $comment->getOwnerId();
$variables['new_indicator_timestamp'] = $comment->getChangedTime();
$variables['created'] = format_date($comment->getCreatedTime());
@@ -677,7 +677,7 @@ function template_preprocess_comment(&$variables) {
'#theme' => 'username',
'#account' => $account_parent,
);
- $variables['parent_author'] = \Drupal::service('renderer')->render($username);
+ $variables['parent_author'] = drupal_render($username);
$variables['parent_created'] = format_date($comment_parent->getCreatedTime());
// Avoid calling format_date() twice on the same timestamp.
if ($comment_parent->getChangedTime() == $comment_parent->getCreatedTime()) {
diff --git a/core/modules/comment/src/Plugin/views/field/EntityLink.php b/core/modules/comment/src/Plugin/views/field/EntityLink.php
index deea2ddee70be7edff6713a13be4cad2ecf0f400..dc4f8cf1811cfb6af318835d023a811effbfc3ca 100644
--- a/core/modules/comment/src/Plugin/views/field/EntityLink.php
+++ b/core/modules/comment/src/Plugin/views/field/EntityLink.php
@@ -72,7 +72,7 @@ public function render(ResultRow $values) {
$entity = $this->getEntity($values);
// Only render the links, if they are defined.
- return !empty($this->build[$entity->id()]['links']['comment__comment']) ? \Drupal::service('renderer')->render($this->build[$entity->id()]['links']['comment__comment']) : '';
+ return !empty($this->build[$entity->id()]['links']['comment__comment']) ? drupal_render($this->build[$entity->id()]['links']['comment__comment']) : '';
}
}
diff --git a/core/modules/comment/src/Plugin/views/field/StatisticsLastCommentName.php b/core/modules/comment/src/Plugin/views/field/StatisticsLastCommentName.php
index d7365b722f38b11fb640113afc471e58df590a05..61a5d17ef4af72f2a98fbf91721a0d8de78b37da 100644
--- a/core/modules/comment/src/Plugin/views/field/StatisticsLastCommentName.php
+++ b/core/modules/comment/src/Plugin/views/field/StatisticsLastCommentName.php
@@ -70,7 +70,7 @@ public function render(ResultRow $values) {
'#theme' => 'username',
'#account' => $account,
);
- return \Drupal::service('renderer')->render($username);
+ return drupal_render($username);
}
else {
return $this->sanitizeValue($this->getValue($values));
diff --git a/core/modules/content_translation/content_translation.admin.inc b/core/modules/content_translation/content_translation.admin.inc
index 2412096949d3bb2dd81c0f78f84b647a82b2c445..39e3247ca17bbe7d2645d7f8d6003496a3ad5bc7 100644
--- a/core/modules/content_translation/content_translation.admin.inc
+++ b/core/modules/content_translation/content_translation.admin.inc
@@ -209,7 +209,7 @@ function _content_translation_preprocess_language_content_settings_table(&$varia
$rows[] = array(
'data' => array(
array(
- 'data' => \Drupal::service('renderer')->render($field_element),
+ 'data' => drupal_render($field_element),
'class' => array('translatable'),
),
array(
@@ -243,7 +243,7 @@ function _content_translation_preprocess_language_content_settings_table(&$varia
$rows[] = array(
'data' => array(
array(
- 'data' => \Drupal::service('renderer')->render($column_element[$key]),
+ 'data' => drupal_render($column_element[$key]),
'class' => array('translatable'),
),
array(
diff --git a/core/modules/contextual/src/Plugin/views/field/ContextualLinks.php b/core/modules/contextual/src/Plugin/views/field/ContextualLinks.php
index 278111036b2e65ec0b4e66833819ef1b38424a4f..585b7f6691ccc0d240b6502c226471b5dedc28d4 100644
--- a/core/modules/contextual/src/Plugin/views/field/ContextualLinks.php
+++ b/core/modules/contextual/src/Plugin/views/field/ContextualLinks.php
@@ -138,7 +138,7 @@ public function render(ResultRow $values) {
'#type' => 'contextual_links_placeholder',
'#id' => _contextual_links_to_id($contextual_links),
);
- return \Drupal::service('renderer')->render($element);
+ return drupal_render($element);
}
else {
return '';
diff --git a/core/modules/file/file.field.inc b/core/modules/file/file.field.inc
index c82f4c1f53a8e46793cfbd7680d13c438e1783b8..bbfc2b23ea4da18d44f6c8eb7e5a26fcc4d2b405 100644
--- a/core/modules/file/file.field.inc
+++ b/core/modules/file/file.field.inc
@@ -73,7 +73,7 @@ function template_preprocess_file_widget_multiple(&$variables) {
// Render everything else together in a column, without the normal wrappers.
$widget['#theme_wrappers'] = array();
- $information = \Drupal::service('renderer')->render($widget);
+ $information = drupal_render($widget);
$display = '';
if ($element['#display_field']) {
unset($widget['display']['#title']);
diff --git a/core/modules/filter/src/Plugin/Filter/FilterCaption.php b/core/modules/filter/src/Plugin/Filter/FilterCaption.php
index 9acf00081e719346c442a7fad9e464a2c3149e5f..c23f1f784fa7c6692957bf008b46beef1958609a 100644
--- a/core/modules/filter/src/Plugin/Filter/FilterCaption.php
+++ b/core/modules/filter/src/Plugin/Filter/FilterCaption.php
@@ -64,7 +64,7 @@ public function process($text, $langcode) {
'#caption' => $caption,
'#classes' => $classes,
);
- $altered_html = \Drupal::service('renderer')->render($filter_caption);
+ $altered_html = drupal_render($filter_caption);
// Load the altered HTML into a new DOMDocument and retrieve the element.
$updated_nodes = Html::load($altered_html)->getElementsByTagName('body')
diff --git a/core/modules/filter/src/Plugin/Filter/FilterHtml.php b/core/modules/filter/src/Plugin/Filter/FilterHtml.php
index da315cfd2723ae8aabc3434cfa82d2053dd350d4..1dc3395161a21f420f3bcee57103ca37fe2d370b 100644
--- a/core/modules/filter/src/Plugin/Filter/FilterHtml.php
+++ b/core/modules/filter/src/Plugin/Filter/FilterHtml.php
@@ -418,7 +418,7 @@ public function tips($long = FALSE) {
'#header' => $header,
'#rows' => $rows,
);
- $output .= \Drupal::service('renderer')->render($table);
+ $output .= drupal_render($table);
$output .= '<p>' . $this->t('Most unusual characters can be directly entered without any problems.') . '</p>';
$output .= '<p>' . $this->t('If you do encounter problems, try using HTML character entities. A common example looks like &amp; for an ampersand & character. For a full list of entities see HTML\'s <a href=":html-entities">entities</a> page. Some of the available characters include:', array(':html-entities' => 'http://www.w3.org/TR/html4/sgml/entities.html')) . '</p>';
@@ -457,7 +457,7 @@ public function tips($long = FALSE) {
'#header' => $header,
'#rows' => $rows,
);
- $output .= \Drupal::service('renderer')->render($table);
+ $output .= drupal_render($table);
return $output;
}
diff --git a/core/modules/forum/forum.module b/core/modules/forum/forum.module
index 4458d6ff8f77dba755541c21baa638ebd383d323..8d4a9f459da6b70d4e43937df2c5f3064e08e9b1 100644
--- a/core/modules/forum/forum.module
+++ b/core/modules/forum/forum.module
@@ -460,12 +460,12 @@ function template_preprocess_forums(&$variables) {
'name' => $topic->getOwner()->getDisplayName(),
'created' => $topic->getCreatedTime(),
));
- $variables['topics'][$id]->submitted = \Drupal::service('renderer')->render($forum_submitted);
+ $variables['topics'][$id]->submitted = drupal_render($forum_submitted);
$forum_submitted = array(
'#theme' => 'forum_submitted',
'#topic' => isset($topic->last_reply) ? $topic->last_reply : NULL,
);
- $variables['topics'][$id]->last_reply = \Drupal::service('renderer')->render($forum_submitted);
+ $variables['topics'][$id]->last_reply = drupal_render($forum_submitted);
$variables['topics'][$id]->new_text = '';
$variables['topics'][$id]->new_url = '';
@@ -569,7 +569,7 @@ function template_preprocess_forum_list(&$variables) {
$variables['forums'][$id]->old_topics = $forum->num_topics - $variables['forums'][$id]->new_topics;
}
$forum_submitted = array('#theme' => 'forum_submitted', '#topic' => $forum->last_post);
- $variables['forums'][$id]->last_reply = \Drupal::service('renderer')->render($forum_submitted);
+ $variables['forums'][$id]->last_reply = drupal_render($forum_submitted);
}
$variables['pager'] = array(
@@ -636,7 +636,7 @@ function template_preprocess_forum_submitted(&$variables) {
$variables['author'] = '';
if (isset($variables['topic']->uid)) {
$username = array('#theme' => 'username', '#account' => User::load($variables['topic']->uid));
- $variables['author'] = \Drupal::service('renderer')->render($username);
+ $variables['author'] = drupal_render($username);
}
$variables['time'] = isset($variables['topic']->created) ? \Drupal::service('date.formatter')->formatTimeDiffSince($variables['topic']->created) : '';
}
diff --git a/core/modules/history/src/Plugin/views/field/HistoryUserTimestamp.php b/core/modules/history/src/Plugin/views/field/HistoryUserTimestamp.php
index 7f4b9551367f419f1a2ab6d5094cef3ea09b5797..e6b0548f0a4e87988d6d3c6ec03f14f189c543ca 100644
--- a/core/modules/history/src/Plugin/views/field/HistoryUserTimestamp.php
+++ b/core/modules/history/src/Plugin/views/field/HistoryUserTimestamp.php
@@ -96,7 +96,7 @@ public function render(ResultRow $values) {
'#theme' => 'mark',
'#status' => $mark,
);
- return $this->renderLink(\Drupal::service('renderer')->render($build), $values);
+ return $this->renderLink(drupal_render($build), $values);
}
}
diff --git a/core/modules/image/src/Form/ImageStyleEditForm.php b/core/modules/image/src/Form/ImageStyleEditForm.php
index 5a3bc50c7cc03856785045e2b7ddd99b1d84a6f6..ecfcf6f3bbc839928b46e8885ff33e94d80cf232 100644
--- a/core/modules/image/src/Form/ImageStyleEditForm.php
+++ b/core/modules/image/src/Form/ImageStyleEditForm.php
@@ -58,7 +58,7 @@ public function form(array $form, FormStateInterface $form_state) {
$form['preview'] = array(
'#type' => 'item',
'#title' => $this->t('Preview'),
- '#markup' => \Drupal::service('renderer')->render($preview_arguments),
+ '#markup' => drupal_render($preview_arguments),
// Render preview above parent elements.
'#weight' => -5,
);
diff --git a/core/modules/node/node.admin.inc b/core/modules/node/node.admin.inc
index f98e2482b6847c77f41ed0d09fc01fcb38580185..dc1be652653d4068f98c1d5c01de478d3779c539 100644
--- a/core/modules/node/node.admin.inc
+++ b/core/modules/node/node.admin.inc
@@ -173,7 +173,7 @@ function _node_mass_update_batch_finished($success, $results, $operations) {
'#theme' => 'item_list',
'#items' => $results,
);
- $message .= \Drupal::service('renderer')->render($item_list);
+ $message .= drupal_render($item_list);
drupal_set_message($message);
}
}
diff --git a/core/modules/node/node.module b/core/modules/node/node.module
index 21ec65a4d9b39f1ca877fbb89de437f39201ca52..5c86a137aeae1a3233c2ac27970651f9cb006cb7 100644
--- a/core/modules/node/node.module
+++ b/core/modules/node/node.module
@@ -575,9 +575,9 @@ function template_preprocess_node(&$variables) {
$variables['node'] = $variables['elements']['#node'];
/** @var \Drupal\node\NodeInterface $node */
$node = $variables['node'];
- $variables['date'] = \Drupal::service('renderer')->render($variables['elements']['created']);
+ $variables['date'] = drupal_render($variables['elements']['created']);
unset($variables['elements']['created']);
- $variables['author_name'] = \Drupal::service('renderer')->render($variables['elements']['uid']);
+ $variables['author_name'] = drupal_render($variables['elements']['uid']);
unset($variables['elements']['uid']);
$variables['url'] = $node->url('canonical', array(
diff --git a/core/modules/node/src/NodeListBuilder.php b/core/modules/node/src/NodeListBuilder.php
index e960b3e343d33888bbbc06319b38b311d8d5c50a..921ac9f3709f2a2efdd149b1a915648071d1f356 100644
--- a/core/modules/node/src/NodeListBuilder.php
+++ b/core/modules/node/src/NodeListBuilder.php
@@ -110,7 +110,7 @@ public function buildRow(EntityInterface $entity) {
$row['title']['data'] = array(
'#type' => 'link',
'#title' => $entity->label(),
- '#suffix' => ' ' . \Drupal::service('renderer')->render($mark),
+ '#suffix' => ' ' . drupal_render($mark),
'#url' => $uri,
);
$row['type'] = node_get_type_label($entity);
diff --git a/core/modules/node/src/Plugin/Action/UnpublishByKeywordNode.php b/core/modules/node/src/Plugin/Action/UnpublishByKeywordNode.php
index 3265f28da3578e0f62cceacab237b5b0eed6f8a6..6ec835eb4c3487773da2fd4beb9fe766e201d974 100644
--- a/core/modules/node/src/Plugin/Action/UnpublishByKeywordNode.php
+++ b/core/modules/node/src/Plugin/Action/UnpublishByKeywordNode.php
@@ -24,7 +24,7 @@ class UnpublishByKeywordNode extends ConfigurableActionBase {
public function execute($node = NULL) {
foreach ($this->configuration['keywords'] as $keyword) {
$elements = node_view(clone $node);
- if (strpos(\Drupal::service('renderer')->render($elements), $keyword) !== FALSE || strpos($node->label(), $keyword) !== FALSE) {
+ if (strpos(drupal_render($elements), $keyword) !== FALSE || strpos($node->label(), $keyword) !== FALSE) {
$node->setPublished(FALSE);
$node->save();
break;
diff --git a/core/modules/rdf/rdf.module b/core/modules/rdf/rdf.module
index 71baa510be5a63095d7130ee608bdcb84e607a94..3108ee12745f4e9f08a34ca37ecb0e5d14364dfb 100644
--- a/core/modules/rdf/rdf.module
+++ b/core/modules/rdf/rdf.module
@@ -329,7 +329,7 @@ function rdf_preprocess_node(&$variables) {
'#theme' => 'rdf_metadata',
'#metadata' => array($date_attributes),
);
- $variables['metadata'] = \Drupal::service('renderer')->render($rdf_metadata);
+ $variables['metadata'] = drupal_render($rdf_metadata);
}
// Adds RDFa markup annotating the number of comments a node has.
@@ -534,7 +534,7 @@ function rdf_preprocess_comment(&$variables) {
if (!empty($variables['content']['comment_body']['#prefix'])) {
$rdf_metadata['#suffix'] = $variables['content']['comment_body']['#prefix'];
}
- $variables['content']['comment_body']['#prefix'] = \Drupal::service('renderer')->render($rdf_metadata);
+ $variables['content']['comment_body']['#prefix'] = drupal_render($rdf_metadata);
}
}
diff --git a/core/modules/search/tests/modules/search_extra_type/src/Plugin/Search/SearchExtraTypeSearch.php b/core/modules/search/tests/modules/search_extra_type/src/Plugin/Search/SearchExtraTypeSearch.php
index e70b279ca3e4a7f91e535e74d66316c75296e722..d02fd81a3c860258b59f968897f38e8a3c005d9a 100644
--- a/core/modules/search/tests/modules/search_extra_type/src/Plugin/Search/SearchExtraTypeSearch.php
+++ b/core/modules/search/tests/modules/search_extra_type/src/Plugin/Search/SearchExtraTypeSearch.php
@@ -81,7 +81,7 @@ public function buildResults() {
$pager = array(
'#type' => 'pager',
);
- $output['suffix']['#markup'] = '</ol>' . \Drupal::service('renderer')->render($pager);
+ $output['suffix']['#markup'] = '</ol>' . drupal_render($pager);
return $output;
}
diff --git a/core/modules/simpletest/simpletest.module b/core/modules/simpletest/simpletest.module
index a6502dab45e85f3392cb3e621f454d7d388b1cf8..f8d6ae8d87690adecab7bc088736fbf96bd458fc 100644
--- a/core/modules/simpletest/simpletest.module
+++ b/core/modules/simpletest/simpletest.module
@@ -437,20 +437,20 @@ function _simpletest_batch_operation($test_list_init, $test_id, &$context) {
'#theme' => 'simpletest_result_summary',
'#label' => t($test_results[$class]['#name'] . ':'),
);
- array_unshift($items, \Drupal::service('renderer')->render($class_test_result));
+ array_unshift($items, drupal_render($class_test_result));
}
$context['message'] = t('Processed test @num of @max - %test.', array('%test' => $info['name'], '@num' => $max - $size, '@max' => $max));
$overall_results = $test_results + array(
'#theme' => 'simpletest_result_summary',
'#label' => t('Overall results:'),
);
- $context['message'] .= \Drupal::service('renderer')->render($overall_results);
+ $context['message'] .= drupal_render($overall_results);
$item_list = array(
'#theme' => 'item_list',
'#items' => $items,
);
- $context['message'] .= \Drupal::service('renderer')->render($item_list);
+ $context['message'] .= drupal_render($item_list);
// Save working values for the next iteration.
$context['sandbox']['tests'] = $test_list;
diff --git a/core/modules/system/tests/modules/theme_test/theme_test.module b/core/modules/system/tests/modules/theme_test/theme_test.module
index 8134aeae18daef69443f408e8721e6e5351163d6..540185ec9ba29c3bef1a305c3f3ba5d0a6e5fdf1 100644
--- a/core/modules/system/tests/modules/theme_test/theme_test.module
+++ b/core/modules/system/tests/modules/theme_test/theme_test.module
@@ -153,7 +153,7 @@ function template_preprocess_theme_test_render_element(&$variables) {
* - element: An associative array containing the properties of the element.
*/
function theme_theme_test_render_element_children($variables) {
- return \Drupal::service('renderer')->render($variables['element']);
+ return drupal_render($variables['element']);
}
/**
diff --git a/core/modules/taxonomy/src/Form/OverviewTerms.php b/core/modules/taxonomy/src/Form/OverviewTerms.php
index 170e4eb3683b080a303e5507d10a094d26a914dd..4c8cee3fb74b40d5674bf6943b0eee4786a1a0eb 100644
--- a/core/modules/taxonomy/src/Form/OverviewTerms.php
+++ b/core/modules/taxonomy/src/Form/OverviewTerms.php
@@ -218,7 +218,7 @@ public function buildForm(array $form, FormStateInterface $form_state, Vocabular
);
}
$form['terms'][$key]['term'] = array(
- '#prefix' => !empty($indentation) ? \Drupal::service('renderer')->render($indentation) : '',
+ '#prefix' => !empty($indentation) ? drupal_render($indentation) : '',
'#type' => 'link',
'#title' => $term->getName(),
'#url' => $term->urlInfo(),
diff --git a/core/modules/update/src/Form/UpdateManagerUpdate.php b/core/modules/update/src/Form/UpdateManagerUpdate.php
index a46b1ab63a9c0438b1e7a6516b1377eba5e7f280..44b7f62695e42a41ab6e2c1b25dfd0bd0218c736 100644
--- a/core/modules/update/src/Form/UpdateManagerUpdate.php
+++ b/core/modules/update/src/Form/UpdateManagerUpdate.php
@@ -69,7 +69,7 @@ public function buildForm(array $form, FormStateInterface $form_state) {
'#last' => $this->state->get('update.last_check') ?: 0,
);
$form['last_check'] = array(
- '#markup' => \Drupal::service('renderer')->render($last_markup),
+ '#markup' => drupal_render($last_markup),
);
if (!_update_manager_check_backends($form, 'update')) {
diff --git a/core/modules/update/update.manager.inc b/core/modules/update/update.manager.inc
index 90551e98f6b39e9a5c8999dc959536245fba2eb0..f9c7c5f3f42d083ad32982efc38858d791601b59 100644
--- a/core/modules/update/update.manager.inc
+++ b/core/modules/update/update.manager.inc
@@ -53,7 +53,7 @@ function update_manager_download_batch_finished($success, $results) {
'#title' => t('Downloading updates failed:'),
'#items' => $results['errors'],
);
- drupal_set_message(\Drupal::service('renderer')->render($item_list), 'error');
+ drupal_set_message(drupal_render($item_list), 'error');
}
elseif ($success) {
drupal_set_message(t('Updates downloaded successfully.'));
diff --git a/core/modules/views/src/Analyzer.php b/core/modules/views/src/Analyzer.php
index a9f2a49e55681bcdce45d73b1c6c1495fff746e8..2a3334292f1474b093c5e75e5c177b098e3c1880 100644
--- a/core/modules/views/src/Analyzer.php
+++ b/core/modules/views/src/Analyzer.php
@@ -77,7 +77,7 @@ public function formatMessages(array $messages) {
'#theme' => 'item_list',
'#items' => $messages,
);
- $message = \Drupal::service('renderer')->render($item_list);
+ $message = drupal_render($item_list);
}
elseif ($messages) {
$message = array_shift($messages);
diff --git a/core/modules/views/src/Plugin/views/area/Result.php b/core/modules/views/src/Plugin/views/area/Result.php
index 74109d3aaeb608bbb019a4c4c5769025cd8285f9..d8139cbee8a5a5cdb41b1129e4decdd12f6f85fd 100644
--- a/core/modules/views/src/Plugin/views/area/Result.php
+++ b/core/modules/views/src/Plugin/views/area/Result.php
@@ -47,7 +47,7 @@ public function buildOptionsForm(&$form, FormStateInterface $form_state) {
'@page_count -- the total page count',
),
);
- $list = \Drupal::service('renderer')->render($item_list);
+ $list = drupal_render($item_list);
$form['content'] = array(
'#title' => $this->t('Display'),
'#type' => 'textarea',
diff --git a/core/modules/views/src/Plugin/views/field/PrerenderList.php b/core/modules/views/src/Plugin/views/field/PrerenderList.php
index 608521d014bc28297989c2820c321d7b7a61ad71..aa8f75207e42de9ac92c7f838f28ea28db1ebff1 100644
--- a/core/modules/views/src/Plugin/views/field/PrerenderList.php
+++ b/core/modules/views/src/Plugin/views/field/PrerenderList.php
@@ -90,7 +90,7 @@ public function renderItems($items) {
'#list_type' => $this->options['type'],
);
}
- return \Drupal::service('renderer')->render($render);
+ return drupal_render($render);
}
}
diff --git a/core/modules/views/views.module b/core/modules/views/views.module
index ac28acd9258d64472d7e9cb14b0300e4c7c5b7c6..e1a4d8ccc9f00d16eaffa39993e2e60e84f781f3 100644
--- a/core/modules/views/views.module
+++ b/core/modules/views/views.module
@@ -614,7 +614,7 @@ function views_pre_render_views_form_views_form($element) {
$row_id = $substitution['row_id'];
$search[] = $substitution['placeholder'];
- $replace[] = isset($element[$field_name][$row_id]) ? \Drupal::service('renderer')->render($element[$field_name][$row_id]) : '';
+ $replace[] = isset($element[$field_name][$row_id]) ? drupal_render($element[$field_name][$row_id]) : '';
}
// Add in substitutions from hook_views_form_substitutions().
$substitutions = \Drupal::moduleHandler()->invokeAll('views_form_substitutions');
@@ -628,7 +628,7 @@ function views_pre_render_views_form_views_form($element) {
}
// Apply substitutions to the rendered output.
- $output = str_replace($search, $replace, \Drupal::service('renderer')->render($element['output']));
+ $output = str_replace($search, $replace, drupal_render($element['output']));
$element['output'] = ['#markup' => ViewsRenderPipelineMarkup::create($output)];
return $element;
diff --git a/core/modules/views_ui/src/Form/BreakLockForm.php b/core/modules/views_ui/src/Form/BreakLockForm.php
index a80f36eeceeeec2c055fd18b0e03491a70bbd4f7..12a3e3efb86076cea91c86d9377ec5b92bc03fc4 100644
--- a/core/modules/views_ui/src/Form/BreakLockForm.php
+++ b/core/modules/views_ui/src/Form/BreakLockForm.php
@@ -74,7 +74,7 @@ public function getDescription() {
'#theme' => 'username',
'#account' => $account,
);
- return $this->t('By breaking this lock, any unsaved changes made by @user will be lost.', array('@user' => \Drupal::service('renderer')->render($username)));
+ return $this->t('By breaking this lock, any unsaved changes made by @user will be lost.', array('@user' => drupal_render($username)));
}
/**
diff --git a/core/modules/views_ui/src/ViewEditForm.php b/core/modules/views_ui/src/ViewEditForm.php
index b4b08023e02bdb5443d9c27c6401482f6062a80a..530a47f9bdf4d136aad26c67f910422f82683dfa 100644
--- a/core/modules/views_ui/src/ViewEditForm.php
+++ b/core/modules/views_ui/src/ViewEditForm.php
@@ -130,7 +130,7 @@ public function form(array $form, FormStateInterface $form_state) {
'#account' => $this->entityManager->getStorage('user')->load($view->lock->owner),
);
$lock_message_substitutions = array(
- '@user' => \Drupal::service('renderer')->render($username),
+ '@user' => drupal_render($username),
'@age' => $this->dateFormatter->formatTimeDiffSince($view->lock->updated),
':url' => $view->url('break-lock-form'),
);