diff --git a/core/modules/config_translation/src/Tests/ConfigTranslationListUiTest.php b/core/modules/config_translation/src/Tests/ConfigTranslationListUiTest.php index fceb41d..b4f84df 100644 --- a/core/modules/config_translation/src/Tests/ConfigTranslationListUiTest.php +++ b/core/modules/config_translation/src/Tests/ConfigTranslationListUiTest.php @@ -496,8 +496,6 @@ public function testTranslateOperationInListUi() { $this->doSettingsPageTest('admin/config/system/site-information'); // Test the account settings page. $this->doSettingsPageTest('admin/config/people/accounts'); - // Test the RSS settings page. - $this->doSettingsPageTest('admin/config/services/rss-publishing'); } } diff --git a/core/modules/system/migration_templates/d6_system_rss.yml b/core/modules/system/migration_templates/d6_system_rss.yml deleted file mode 100644 index d112e82..0000000 --- a/core/modules/system/migration_templates/d6_system_rss.yml +++ /dev/null @@ -1,15 +0,0 @@ -id: d6_system_rss -label: RSS configuration -migration_tags: - - Drupal 6 -source: - plugin: variable - variables: - - feed_default_items - - feed_item_length -process: - 'items/limit': feed_default_items - 'items/view_mode': feed_item_length -destination: - plugin: config - config_name: system.rss diff --git a/core/modules/system/src/Form/RssFeedsForm.php b/core/modules/system/src/Form/RssFeedsForm.php deleted file mode 100644 index cde9964..0000000 --- a/core/modules/system/src/Form/RssFeedsForm.php +++ /dev/null @@ -1,79 +0,0 @@ -config('system.rss'); - $form['feed_description'] = array( - '#type' => 'textarea', - '#title' => t('Feed description'), - '#default_value' => $rss_config->get('channel.description'), - '#description' => t('Description of your site, included in each feed.') - ); - $options = array(1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 15, 20, 25, 30); - $form['feed_default_items'] = array( - '#type' => 'select', - '#title' => t('Number of items in each feed'), - '#default_value' => $rss_config->get('items.limit'), - '#options' => array_combine($options, $options), - '#description' => t('Default number of items to include in each feed.') - ); - $form['feed_view_mode'] = array( - '#type' => 'select', - '#title' => t('Feed content'), - '#default_value' => $rss_config->get('items.view_mode'), - '#options' => array( - 'title' => t('Titles only'), - 'teaser' => t('Titles plus teaser'), - 'fulltext' => t('Full text'), - ), - '#description' => t('Global setting for the default display of content items in each feed.') - ); - - return parent::buildForm($form, $form_state); - } - - /** - * {@inheritdoc} - */ - public function submitForm(array &$form, FormStateInterface $form_state) { - $this->config('system.rss') - ->set('channel.description', $form_state->getValue('feed_description')) - ->set('items.limit', $form_state->getValue('feed_default_items')) - ->set('items.view_mode', $form_state->getValue('feed_view_mode')) - ->save(); - - parent::submitForm($form, $form_state); - } - -} diff --git a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemRssTest.php b/core/modules/system/src/Tests/Migrate/d6/MigrateSystemRssTest.php deleted file mode 100644 index 3e59289..0000000 --- a/core/modules/system/src/Tests/Migrate/d6/MigrateSystemRssTest.php +++ /dev/null @@ -1,36 +0,0 @@ -executeMigration('d6_system_rss'); - } - - /** - * Tests migration of system (rss) variables to system.rss.yml. - */ - public function testSystemRss() { - $config = $this->config('system.rss'); - $this->assertIdentical(10, $config->get('items.limit')); - $this->assertIdentical('title', $config->get('items.view_mode')); - } - -} diff --git a/core/modules/system/system.config_translation.yml b/core/modules/system/system.config_translation.yml index 87cc98c..e56f239 100644 --- a/core/modules/system/system.config_translation.yml +++ b/core/modules/system/system.config_translation.yml @@ -9,9 +9,3 @@ system.site_information_settings: base_route_name: system.site_information_settings names: - system.site - -system.rss_feeds_settings: - title: 'RSS publishing' - base_route_name: system.rss_feeds_settings - names: - - system.rss diff --git a/core/modules/system/system.links.menu.yml b/core/modules/system/system.links.menu.yml index ba21cee..150e520 100644 --- a/core/modules/system/system.links.menu.yml +++ b/core/modules/system/system.links.menu.yml @@ -53,11 +53,6 @@ system.admin_config_services: title: 'Web services' parent: system.admin_config route_name: system.admin_config_services -system.rss_feeds_settings: - title: 'RSS publishing' - parent: system.admin_config_services - description: 'Configure the site description, the number of items per feed and whether feeds should be titles/teasers/full-text.' - route_name: system.rss_feeds_settings system.admin_config_development: route_name: system.admin_config_development parent: system.admin_config diff --git a/core/modules/system/system.links.task.yml b/core/modules/system/system.links.task.yml index a151835..de0956a 100644 --- a/core/modules/system/system.links.task.yml +++ b/core/modules/system/system.links.task.yml @@ -1,8 +1,3 @@ -system.rss_feeds_settings_tab: - route_name: system.rss_feeds_settings - title: Settings - base_route: system.rss_feeds_settings - system.site_maintenance_mode_tab: route_name: system.site_maintenance_mode title: Settings diff --git a/core/modules/system/system.routing.yml b/core/modules/system/system.routing.yml index e6108ac..b1891b0 100644 --- a/core/modules/system/system.routing.yml +++ b/core/modules/system/system.routing.yml @@ -182,14 +182,6 @@ system.file_system_settings: requirements: _permission: 'administer site configuration' -system.rss_feeds_settings: - path: '/admin/config/services/rss-publishing' - defaults: - _form: 'Drupal\system\Form\RssFeedsForm' - _title: 'RSS publishing' - requirements: - _permission: 'administer site configuration' - system.regional_settings: path: '/admin/config/regional/settings' defaults: