diff --git a/core/modules/system/tests/modules/ajax_test/src/Form/AjaxTestForm.php b/core/modules/system/tests/modules/ajax_test/src/Form/AjaxTestForm.php index 5d1a33b..3704f15 100644 --- a/core/modules/system/tests/modules/ajax_test/src/Form/AjaxTestForm.php +++ b/core/modules/system/tests/modules/ajax_test/src/Form/AjaxTestForm.php @@ -9,7 +9,6 @@ use Drupal\Core\Form\FormBase; use Drupal\Core\Form\FormStateInterface; -use Symfony\Component\HttpFoundation\Response; /** * Dummy form for testing DialogRenderer with _form routes. @@ -72,8 +71,4 @@ public function submitForm(array &$form, FormStateInterface $form_state) {} */ public function validateForm(array &$form, FormStateInterface $form_state) {} - public function preview(array &$form, FormStateInterface $form_state) { - return new Response('#ajax-triggered submit worked!'); - } - } diff --git a/core/modules/views/src/Tests/Plugin/DisplayFeedTest.php b/core/modules/views/src/Tests/Plugin/DisplayFeedTest.php index d1b9f50..8411ce2 100644 --- a/core/modules/views/src/Tests/Plugin/DisplayFeedTest.php +++ b/core/modules/views/src/Tests/Plugin/DisplayFeedTest.php @@ -56,8 +56,8 @@ public function testFeedOutput() { $this->drupalGet('test-feed-display.xml'); $result = $this->xpath('//title'); - $this->assertEqual($result[1], $node_title, 'Node title with HTML entities displays correctly.'); $this->assertEqual($result[0], $site_name, 'The site title is used for the feed title.'); + $this->assertEqual($result[1], $node_title, 'Node title with HTML entities displays correctly.'); $view = $this->container->get('entity.manager')->getStorage('view')->load('test_display_feed'); $display = &$view->getDisplay('feed_1'); diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_feed.yml b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_feed.yml index 4c178a1..4b54199 100644 --- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_feed.yml +++ b/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_display_feed.yml @@ -115,8 +115,6 @@ display: style: type: rss sitename_title: true - field_langcode: '***LANGUAGE_language_content***' - field_langcode_add_to_query: null display_description: '' display_plugin: feed display_title: 'Feed with Fields' diff --git a/core/modules/views/views.theme.inc b/core/modules/views/views.theme.inc index 630d6eb..fd68580 100644 --- a/core/modules/views/views.theme.inc +++ b/core/modules/views/views.theme.inc @@ -912,9 +912,9 @@ function template_preprocess_views_view_rss(&$variables) { */ function template_preprocess_views_view_row_rss(&$variables) { $item = $variables['row']; - $variables['title'] = String::checkPlain($item->title); + $variables['title'] = $item->title; $variables['link'] = $item->link; - $variables['description'] = String::checkPlain($item->description); + $variables['description'] = $item->description; $variables['item_elements'] = array(); foreach ($item->elements as $element) { if (isset($element['attributes']) && is_array($element['attributes'])) {