tag is always allowed — HTML without
tags is nonsensical. + $format_tags = array('p'); + + // Given the list of possible format tags, automatically determine whether + // the current text format allows this tag, and thus whether it should show + // up in the "Format" dropdown. + $possible_format_tags = array('h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'pre'); + foreach ($possible_format_tags as $tag) { + $input = '<' . $tag . '>TEST'; + $output = trim(check_markup($input, $format->id())); + if ($input == $output) { + $format_tags[] = $tag; + } + } + $format_tags = implode(';', $format_tags); + + // Cache the "format_tags" configuration. This cache item is infinitely + // valid; it only changes whenever the text format is changed, which is + // guaranteed by the hook_ENTITY_TYPE_update() and hook_ENTITY_TYPE_insert() + // hook implementations. + \Drupal::state()->set($key, $format_tags); + } +} diff --git a/core/modules/ckeditor/src/Plugin/CKEditorPlugin/Internal.php b/core/modules/ckeditor/src/Plugin/CKEditorPlugin/Internal.php index d64c806..8dfbc00 100644 --- a/core/modules/ckeditor/src/Plugin/CKEditorPlugin/Internal.php +++ b/core/modules/ckeditor/src/Plugin/CKEditorPlugin/Internal.php @@ -302,6 +302,9 @@ public function getButtons() { * * @return array * An array containing the "format_tags" configuration. + * + * @see ckeditor_rebuild() + * @see ckeditor_filter_format_update() */ protected function generateFormatTagsSetting(Editor $editor) { // When no text format is associated yet, assume no tag is allowed. @@ -311,35 +314,7 @@ protected function generateFormatTagsSetting(Editor $editor) { } $format = $editor->getFilterFormat(); - $cid = 'ckeditor_internal_format_tags:' . $format->id(); - - if ($cached = $this->cache->get($cid)) { - $format_tags = $cached->data; - } - else { - // The
tag is always allowed — HTML without
tags is nonsensical. - $format_tags = array('p'); - - // Given the list of possible format tags, automatically determine whether - // the current text format allows this tag, and thus whether it should show - // up in the "Format" dropdown. - $possible_format_tags = array('h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'pre'); - foreach ($possible_format_tags as $tag) { - $input = '<' . $tag . '>TEST'; - $output = trim(check_markup($input, $editor->id())); - if ($input == $output) { - $format_tags[] = $tag; - } - } - $format_tags = implode(';', $format_tags); - - // Cache the "format_tags" configuration. This cache item is infinitely - // valid; it only changes whenever the text format is changed, hence it's - // tagged with the text format's cache tag. - $this->cache->set($cid, $format_tags, Cache::PERMANENT, $format->getCacheTags()); - } - - return $format_tags; + return \Drupal::state()->get('ckeditor_internal_format_tags:' . $format->id()); } /** diff --git a/core/modules/ckeditor/src/Tests/CKEditorTest.php b/core/modules/ckeditor/src/Tests/CKEditorTest.php index 5d7f90c..46390a4 100644 --- a/core/modules/ckeditor/src/Tests/CKEditorTest.php +++ b/core/modules/ckeditor/src/Tests/CKEditorTest.php @@ -103,6 +103,9 @@ function testGetJSSettings() { $this->container->get('plugin.manager.editor')->clearCachedDefinitions(); $this->ckeditor = $this->container->get('plugin.manager.editor')->createInstance('ckeditor'); $this->container->get('plugin.manager.ckeditor.plugin')->clearCachedDefinitions(); + // KernelTestBase::enableModules() unfortunately doesn't invoke + // hook_rebuild() just like a "real" Drupal site would. Do it manually. + \Drupal::moduleHandler()->invoke('ckeditor', 'rebuild'); $settings = $editor->getSettings(); $settings['toolbar']['rows'][0][0]['items'][] = 'Strike'; $settings['toolbar']['rows'][0][0]['items'][] = 'Format'; @@ -206,6 +209,11 @@ function testGetJSSettings() { $expected_config['format_tags'] = 'p'; ksort($expected_config); $this->assertIdentical($expected_config, $this->ckeditor->getJSSettings($editor), 'Generated JS settings are correct for customized configuration.'); + + // Assert that we're robust enough to withstand people messing with State + // manually. + \Drupal::state()->delete('ckeditor_internal_format_tags:' . $format->id()); + $this->assertIdentical($expected_config, $this->ckeditor->getJSSettings($editor), 'Even when somebody manually deleted the key-value pair in State with the pre-calculated format_tags setting, it returns "p" — because the
tag is always allowed.'); } /** diff --git a/core/modules/comment/src/CommentPostRenderCache.php b/core/modules/comment/src/CommentPostRenderCache.php index 7bf100d..ce64d6d 100644 --- a/core/modules/comment/src/CommentPostRenderCache.php +++ b/core/modules/comment/src/CommentPostRenderCache.php @@ -70,13 +70,12 @@ public function renderForm(array $element, array $context) { ); $comment = $this->entityManager->getStorage('comment')->create($values); $form = $this->entityFormBuilder->getForm($comment); - // @todo: This only works as long as assets are still tracked in a global - // static variable, see https://drupal.org/node/2238835 $markup = drupal_render($form); $callback = 'comment.post_render_cache:renderForm'; $placeholder = drupal_render_cache_generate_placeholder($callback, $context); $element['#markup'] = str_replace($placeholder, $markup, $element['#markup']); + $element['#attached'] = drupal_merge_attached($element['#attached'], $form['#attached']); return $element; } diff --git a/core/modules/comment/src/Plugin/views/row/Rss.php b/core/modules/comment/src/Plugin/views/row/Rss.php index 010cd42..1dc6c8b 100644 --- a/core/modules/comment/src/Plugin/views/row/Rss.php +++ b/core/modules/comment/src/Plugin/views/row/Rss.php @@ -130,7 +130,7 @@ public function render($row) { if ($view_mode != 'title') { // We render comment contents. - $item_text .= drupal_render($build); + $item_text .= drupal_render_root($build); } $item = new \stdClass(); @@ -146,7 +146,7 @@ public function render($row) { '#options' => $this->options, '#row' => $item, ); - return drupal_render($build); + return drupal_render_root($build); } } diff --git a/core/modules/contact/contact.module b/core/modules/contact/contact.module index f6fc4cd..0ad6093 100644 --- a/core/modules/contact/contact.module +++ b/core/modules/contact/contact.module @@ -115,7 +115,7 @@ function contact_mail($key, &$message, $params) { $message['subject'] .= t('[!form] !subject', $variables, $options); $message['body'][] = t("!sender-name (!sender-url) sent a message using the contact form at !form-url.", $variables, $options); $build = entity_view($contact_message, 'mail', $language->getId()); - $message['body'][] = drupal_render($build); + $message['body'][] = drupal_render_root($build); break; case 'page_autoreply': @@ -134,7 +134,7 @@ function contact_mail($key, &$message, $params) { $message['body'][] = t("!sender-name (!sender-url) has sent you a message via your contact form at !site-name.", $variables, $options); $message['body'][] = t("If you don't want to receive such emails, you can change your settings at !recipient-edit-url.", $variables, $options); $build = entity_view($contact_message, 'mail', $language->getId()); - $message['body'][] = drupal_render($build); + $message['body'][] = drupal_render_root($build); break; } } diff --git a/core/modules/filter/filter.module b/core/modules/filter/filter.module index d4a2253..e0b98ee 100644 --- a/core/modules/filter/filter.module +++ b/core/modules/filter/filter.module @@ -303,7 +303,7 @@ function check_markup($text, $format_id = NULL, $langcode = '', $filter_types_to '#filter_types_to_skip' => $filter_types_to_skip, '#langcode' => $langcode, ); - return drupal_render($build); + return drupal_render_root($build); } /** diff --git a/core/modules/filter/src/Tests/FilterAPITest.php b/core/modules/filter/src/Tests/FilterAPITest.php index 955ee87..588546e 100644 --- a/core/modules/filter/src/Tests/FilterAPITest.php +++ b/core/modules/filter/src/Tests/FilterAPITest.php @@ -234,7 +234,7 @@ function testProcessedTextElement() { '#text' => '
Hello, world!
', '#format' => 'element_test', ); - drupal_render($build); + drupal_render_root($build); // Verify the assets, cache tags and #post_render_cache callbacks. $expected_assets = array( diff --git a/core/modules/node/node.module b/core/modules/node/node.module index bb4e2b2..d65d59d 100644 --- a/core/modules/node/node.module +++ b/core/modules/node/node.module @@ -587,9 +587,9 @@ function template_preprocess_node(&$variables) { $variables['node'] = $variables['elements']['#node']; /** @var \Drupal\node\NodeInterface $node */ $node = $variables['node']; - $variables['date'] = drupal_render($variables['elements']['created'], TRUE); + $variables['date'] = drupal_render($variables['elements']['created']); unset($variables['elements']['created']); - $variables['author_name'] = drupal_render($variables['elements']['uid'], TRUE); + $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/Plugin/views/row/Rss.php b/core/modules/node/src/Plugin/views/row/Rss.php index 9c501a7..782d21f 100644 --- a/core/modules/node/src/Plugin/views/row/Rss.php +++ b/core/modules/node/src/Plugin/views/row/Rss.php @@ -147,7 +147,7 @@ public function render($row) { if ($display_mode != 'title') { // We render node contents. - $item_text .= drupal_render($build); + $item_text .= drupal_render_root($build); } $item = new \stdClass(); @@ -162,7 +162,7 @@ public function render($row) { '#options' => $this->options, '#row' => $item, ); - return drupal_render($theme_function); + return drupal_render_root($theme_function); } } diff --git a/core/modules/rest/src/Plugin/views/display/RestExport.php b/core/modules/rest/src/Plugin/views/display/RestExport.php index a78b175..076eb1c 100644 --- a/core/modules/rest/src/Plugin/views/display/RestExport.php +++ b/core/modules/rest/src/Plugin/views/display/RestExport.php @@ -271,7 +271,7 @@ public function execute() { parent::execute(); $output = $this->view->render(); - return new Response(drupal_render($output), 200, array('Content-type' => $this->getMimeType())); + return new Response(drupal_render_root($output), 200, array('Content-type' => $this->getMimeType())); } /** diff --git a/core/modules/rest/src/Tests/Views/StyleSerializerTest.php b/core/modules/rest/src/Tests/Views/StyleSerializerTest.php index 0822eab..87206e0 100644 --- a/core/modules/rest/src/Tests/Views/StyleSerializerTest.php +++ b/core/modules/rest/src/Tests/Views/StyleSerializerTest.php @@ -92,7 +92,7 @@ public function testSerializerResponses() { // Mock the request content type by setting it on the display handler. $view->display_handler->setContentType('json'); $output = $view->preview(); - $this->assertIdentical($actual_json, drupal_render($output), 'The expected JSON preview output was found.'); + $this->assertIdentical($actual_json, drupal_render_root($output), 'The expected JSON preview output was found.'); // Test a 403 callback. $this->drupalGet('test/serialize/denied'); diff --git a/core/modules/system/src/Controller/BatchController.php b/core/modules/system/src/Controller/BatchController.php index 3547667..4245480 100644 --- a/core/modules/system/src/Controller/BatchController.php +++ b/core/modules/system/src/Controller/BatchController.php @@ -106,9 +106,9 @@ public function render(array $output, $status_code = 200) { $page = $this->fragmentRenderer->preparePage($page, $page_array); - $page->setBodyTop(drupal_render($page_array['page_top'])); - $page->setBodyBottom(drupal_render($page_array['page_bottom'])); - $page->setContent(drupal_render($page_array)); + $page->setBodyTop(drupal_render_root($page_array['page_top'])); + $page->setBodyBottom(drupal_render_root($page_array['page_bottom'])); + $page->setContent(drupal_render_root($page_array)); drupal_process_attached($page_array); if (isset($page_array['page_top'])) { diff --git a/core/modules/system/src/Tests/Common/RenderTest.php b/core/modules/system/src/Tests/Common/RenderTest.php index 15da0e5..381ff8d 100644 --- a/core/modules/system/src/Tests/Common/RenderTest.php +++ b/core/modules/system/src/Tests/Common/RenderTest.php @@ -501,7 +501,7 @@ function testDrupalRenderPostRenderCache() { // #cache disabled. $element = $test_element; $element['#markup'] = '#cache disabled
'; - $output = drupal_render($element); + $output = drupal_render_root($element); $this->assertIdentical($output, 'overridden
', 'Output is overridden.'); $this->assertIdentical($element['#markup'], 'overridden
', '#markup is overridden.'); $expected_js = [ @@ -518,7 +518,7 @@ function testDrupalRenderPostRenderCache() { $element = $test_element; $element['#cache'] = array('cid' => 'post_render_cache_test_GET'); $element['#markup'] = '#cache enabled, GET
'; - $output = drupal_render($element); + $output = drupal_render_root($element); $this->assertIdentical($output, 'overridden
', 'Output is overridden.'); $this->assertTrue(isset($element['#printed']), 'No cache hit'); $this->assertIdentical($element['#markup'], 'overridden
', '#markup is overridden.'); @@ -542,7 +542,7 @@ function testDrupalRenderPostRenderCache() { // GET request: #cache enabled, cache hit. $element['#cache'] = array('cid' => 'post_render_cache_test_GET'); $element['#markup'] = '#cache enabled, GET
'; - $output = drupal_render($element); + $output = drupal_render_root($element); $this->assertIdentical($output, 'overridden
', 'Output is overridden.'); $this->assertFalse(isset($element['#printed']), 'Cache hit'); $this->assertIdentical($element['#markup'], 'overridden
', '#markup is overridden.'); @@ -560,7 +560,7 @@ function testDrupalRenderPostRenderCache() { $element = $test_element; $element['#cache'] = array('cid' => 'post_render_cache_test_POST'); $element['#markup'] = '#cache enabled, POST
'; - $output = drupal_render($element); + $output = drupal_render_root($element); $this->assertIdentical($output, 'overridden
', 'Output is overridden.'); $this->assertTrue(isset($element['#printed']), 'No cache hit'); $this->assertIdentical($element['#markup'], 'overridden
', '#markup is overridden.'); @@ -624,7 +624,7 @@ function testDrupalRenderChildrenPostRenderCache() { '#markup' => 'Subchild', ); $element = $test_element; - $output = drupal_render($element); + $output = drupal_render_root($element); $this->assertIdentical($output, 'overridden
', 'Output is overridden.'); $this->assertTrue(isset($element['#printed']), 'No cache hit'); $this->assertIdentical($element['#markup'], 'overridden
', '#markup is overridden.'); @@ -672,7 +672,7 @@ function testDrupalRenderChildrenPostRenderCache() { // GET request: #cache enabled, cache hit. $element = $test_element; - $output = drupal_render($element); + $output = drupal_render_root($element); $this->assertIdentical($output, 'overridden
', 'Output is overridden.'); $this->assertFalse(isset($element['#printed']), 'Cache hit'); $this->assertIdentical($element['#attached']['js'], $expected_js, '#attached is modified; both the original JavaScript setting and the ones added by each #post_render_cache callback exist.'); @@ -681,7 +681,7 @@ function testDrupalRenderChildrenPostRenderCache() { // Use the exact same element, but now unset #cache. unset($test_element['#cache']); $element = $test_element; - $output = drupal_render($element); + $output = drupal_render_root($element); $this->assertIdentical($output, 'overridden
', 'Output is overridden.'); $this->assertIdentical($element['#markup'], 'overridden
', '#markup is overridden.'); $this->assertIdentical($element['#attached']['js'], $expected_js, '#attached is modified; both the original JavaScript setting and the ones added by each #post_render_cache callback exist.'); @@ -697,7 +697,7 @@ function testDrupalRenderChildrenPostRenderCache() { $element = $test_element; $element['#cache']['keys'] = array('simpletest', 'drupal_render', 'children_post_render_cache', 'nested_cache_parent'); $element['child']['#cache']['keys'] = array('simpletest', 'drupal_render', 'children_post_render_cache', 'nested_cache_child'); - $output = drupal_render($element); + $output = drupal_render_root($element); $this->assertIdentical($output, 'overridden
', 'Output is overridden.'); $this->assertTrue(isset($element['#printed']), 'No cache hit'); $this->assertIdentical($element['#markup'], 'overridden
', '#markup is overridden.'); @@ -768,7 +768,7 @@ function testDrupalRenderChildrenPostRenderCache() { // GET request: #cache enabled, cache hit, parent element. $element = $test_element; $element['#cache']['keys'] = array('simpletest', 'drupal_render', 'children_post_render_cache', 'nested_cache_parent'); - $output = drupal_render($element); + $output = drupal_render_root($element); $this->assertIdentical($output, 'overridden
', 'Output is overridden.'); $this->assertFalse(isset($element['#printed']), 'Cache hit'); $this->assertIdentical($element['#attached']['js'], $expected_js, '#attached is modified; both the original JavaScript setting and the ones added by each #post_render_cache callback exist.'); @@ -777,7 +777,7 @@ function testDrupalRenderChildrenPostRenderCache() { $element = $test_element; $element['child']['#cache']['keys'] = array('simpletest', 'drupal_render', 'children_post_render_cache', 'nested_cache_child'); $element = $element['child']; - $output = drupal_render($element); + $output = drupal_render_root($element); $this->assertIdentical($output, 'overridden
', 'Output is overridden.'); $this->assertFalse(isset($element['#printed']), 'Cache hit'); $expected_js = [ @@ -815,7 +815,7 @@ function testDrupalRenderRenderCachePlaceholder() { // #cache disabled. $element = $test_element; - $output = drupal_render($element); + $output = drupal_render_root($element); $this->assertIdentical($output, $expected_output, 'Placeholder was replaced in output'); $expected_js = [ ['type' => 'setting', 'data' => ['common_test' => $context]], @@ -829,7 +829,7 @@ function testDrupalRenderRenderCachePlaceholder() { // GET request: #cache enabled, cache miss. $element = $test_element; $element['#cache'] = array('cid' => 'render_cache_placeholder_test_GET'); - $output = drupal_render($element); + $output = drupal_render_root($element); $this->assertIdentical($output, $expected_output, 'Placeholder was replaced in output'); $this->assertTrue(isset($element['#printed']), 'No cache hit'); $this->assertIdentical($element['#markup'], $expected_output, 'Placeholder was replaced in #markup.'); @@ -866,7 +866,7 @@ function testDrupalRenderRenderCachePlaceholder() { // GET request: #cache enabled, cache hit. $element = $test_element; $element['#cache'] = array('cid' => 'render_cache_placeholder_test_GET'); - $output = drupal_render($element); + $output = drupal_render_root($element); $this->assertIdentical($output, $expected_output, 'Placeholder was replaced in output'); $this->assertFalse(isset($element['#printed']), 'Cache hit'); $this->assertIdentical($element['#markup'], $expected_output, 'Placeholder was replaced in #markup.'); @@ -903,7 +903,7 @@ function testDrupalRenderChildElementRenderCachePlaceholder() { // #cache disabled. $element = $test_element; - $output = drupal_render($element); + $output = drupal_render_root($element); $this->assertIdentical($output, $expected_output, 'Placeholder was replaced in output'); $expected_js = [ ['type' => 'setting', 'data' => ['common_test' => $context]], @@ -919,7 +919,7 @@ function testDrupalRenderChildElementRenderCachePlaceholder() { $element['#cache'] = array('cid' => 'render_cache_placeholder_test_GET'); $element['foo']['#cache'] = array('cid' => 'render_cache_placeholder_test_child_GET'); // Render, which will use the common-test-render-element.html.twig template. - $output = drupal_render($element); + $output = drupal_render_root($element); $this->assertIdentical($output, $expected_output); //, 'Placeholder was replaced in output'); $this->assertTrue(isset($element['#printed']), 'No cache hit'); $this->assertIdentical($element['#markup'], $expected_output, 'Placeholder was replaced in #markup.'); @@ -1014,7 +1014,7 @@ function testDrupalRenderChildElementRenderCachePlaceholder() { $element = $test_element; $element['#cache'] = array('cid' => 'render_cache_placeholder_test_GET'); // Render, which will use the common-test-render-element.html.twig template. - $output = drupal_render($element); + $output = drupal_render_root($element); $this->assertIdentical($output, $expected_output, 'Placeholder was replaced in output'); $this->assertFalse(isset($element['#printed']), 'Cache hit'); $this->assertIdentical($element['#markup'], $expected_output, 'Placeholder was replaced in #markup.'); @@ -1110,7 +1110,7 @@ function testDrupalRenderBubbling() { \Drupal::cache('render')->set('cached_nested', array('#markup' => 'Cached nested!', '#attached' => array(), '#cache' => array('tags' => array()), '#post_render_cache' => array())); \Drupal::cache('render')->delete('uncached_nested'); - $output = drupal_render($test_element); + $output = drupal_render_root($test_element); // Assert top-level. $this->assertEqual('Cache tag!Asset!Post-render cache!barquxNested!Cached nested!', trim($output), 'Expected HTML generated.'); $this->assertEqual(array('child:cache_tag'), $test_element['#cache']['tags'], 'Expected cache tags found.'); diff --git a/core/modules/system/src/Tests/Common/RenderWebTest.php b/core/modules/system/src/Tests/Common/RenderWebTest.php index 1eb0669..c2cb88f 100644 --- a/core/modules/system/src/Tests/Common/RenderWebTest.php +++ b/core/modules/system/src/Tests/Common/RenderWebTest.php @@ -149,7 +149,7 @@ function testDrupalRenderFormElements() { */ protected function assertRenderedElement(array $element, $xpath, array $xpath_args = array()) { $original_element = $element; - $this->drupalSetContent(drupal_render($element)); + $this->drupalSetContent(drupal_render_root($element)); $this->verbose('',
- '#markup' => String::checkPlain(drupal_render($output)),
+ '#markup' => String::checkPlain(drupal_render_root($output)),
'#suffix' => '',
);
}
diff --git a/core/modules/views/src/Plugin/views/row/RssFields.php b/core/modules/views/src/Plugin/views/row/RssFields.php
index d7f9bb0..6d0ae5b 100644
--- a/core/modules/views/src/Plugin/views/row/RssFields.php
+++ b/core/modules/views/src/Plugin/views/row/RssFields.php
@@ -180,7 +180,7 @@ public function render($row) {
'#row' => $item,
'#field_alias' => isset($this->field_alias) ? $this->field_alias : '',
);
- return drupal_render($build);
+ return drupal_render_root($build);
}
/**
diff --git a/core/tests/Drupal/Tests/Core/Ajax/AjaxResponseRendererTest.php b/core/tests/Drupal/Tests/Core/Ajax/AjaxResponseRendererTest.php
index 035c1e4..2c71d87 100644
--- a/core/tests/Drupal/Tests/Core/Ajax/AjaxResponseRendererTest.php
+++ b/core/tests/Drupal/Tests/Core/Ajax/AjaxResponseRendererTest.php
@@ -101,7 +101,7 @@ class TestAjaxResponseRenderer extends AjaxResponseRenderer {
/**
* {@inheritdoc}
*/
- protected function drupalRender(&$elements, $is_recursive_call = FALSE) {
+ protected function drupalRenderRoot(&$elements) {
if (isset($elements['#markup'])) {
return $elements['#markup'];
}