diff --git a/core/modules/forum/forum.module b/core/modules/forum/forum.module index e2e8721..b1cb04d 100644 --- a/core/modules/forum/forum.module +++ b/core/modules/forum/forum.module @@ -776,7 +776,7 @@ function template_preprocess_forum_list(&$variables) { $row = 0; // Sanitize each forum so that the template can safely print the data. foreach ($variables['forums'] as $id => $forum) { - $variables['forums'][$id]->description = filter_xss_admin($forum->forum_description->value); + $variables['forums'][$id]->description = $forum->forum_description->processed; $variables['forums'][$id]->link = url("forum/" . $forum->id()); $variables['forums'][$id]->name = check_plain($forum->label()); $variables['forums'][$id]->is_container = !empty($forum->forum_container->value); diff --git a/core/modules/forum/templates/forum-list.html.twig b/core/modules/forum/templates/forum-list.html.twig index 5b41f6a..4135e26 100644 --- a/core/modules/forum/templates/forum-list.html.twig +++ b/core/modules/forum/templates/forum-list.html.twig @@ -15,8 +15,7 @@ * - icon_title: Text alternative for the forum icon. * - name: The name of the forum. * - link: The URL to link to this forum. - * - description: The description field for the forum, containing: - * - value: The descriptive text for the forum. + * - description: The description of the forum. * - new_topics: A flag indicating if the forum contains unread posts. * - new_url: A URL to the forum's unread posts. * - new_text: Text for the above URL, which tells how many new posts. @@ -59,8 +58,8 @@ {{ forum.icon_title }}
{{ forum.label }}
- {% if forum.description.value %} -
{{ forum.description.value }}
+ {% if forum.description %} +
{{ forum.description }}
{% endif %} {% for i in 1..forum.depth if forum.depth > 0 %}{% endfor %} diff --git a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermTest.php b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermTest.php index 3017224..5db5dd1 100644 --- a/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermTest.php +++ b/core/modules/taxonomy/lib/Drupal/taxonomy/Tests/TermTest.php @@ -337,11 +337,6 @@ function testTermInterface() { $this->drupalGet('taxonomy/term/' . $term->id()); $this->assertText($edit['name'], 'The randomly generated term name is present.'); - // Check that the description value is processed. - $term->description->value = $value = $this->randomName(); - $term->save(); - $this->assertEqual($term->description->processed, "

$value

\n"); - // Check that the term feed page is working. $this->drupalGet('taxonomy/term/' . $term->id() . '/feed');