From af0f5628d23380c3ad390404d1ca6575150708f9 Mon Sep 17 00:00:00 2001
From: Nathaniel Catchpole <catch@35733.no-reply.drupal.org>
Date: Tue, 4 Mar 2014 13:32:52 +0000
Subject: [PATCH] Issue #2209015 by longwave, awochna: Aggregator Doesn't Show
Up In admin/config.
---
core/modules/aggregator/aggregator.module | 1 +
.../Drupal/aggregator/Tests/AggregatorConfigurationTest.php | 4 +++-
.../lib/Drupal/aggregator/Tests/AggregatorTestBase.php | 2 +-
core/modules/image/lib/Drupal/image/Entity/ImageStyle.php | 3 ---
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/core/modules/aggregator/aggregator.module b/core/modules/aggregator/aggregator.module
index fce70cb1a188..78a8e17ef6f7 100644
--- a/core/modules/aggregator/aggregator.module
+++ b/core/modules/aggregator/aggregator.module
@@ -96,6 +96,7 @@ function aggregator_menu_link_defaults() {
'link_title' => 'Feed aggregator',
'description' => "Configure which content your site aggregates from other sites, how often it polls them, and how they're categorized.",
'route_name' => 'aggregator.admin_overview',
+ 'parent' => 'system.admin.config.services',
'weight' => 10,
);
$links['aggregator'] = array(
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Tests/AggregatorConfigurationTest.php b/core/modules/aggregator/lib/Drupal/aggregator/Tests/AggregatorConfigurationTest.php
index 51e19640f663..a3d9a442cdba 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Tests/AggregatorConfigurationTest.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Tests/AggregatorConfigurationTest.php
@@ -23,7 +23,9 @@ public static function getInfo() {
* Tests the settings form to ensure the correct default values are used.
*/
function testSettingsPage() {
- $this->drupalGet('admin/config/services/aggregator/settings');
+ $this->drupalGet('admin/config');
+ $this->clickLink('Feed aggregator');
+ $this->clickLink('Settings');
// Make sure that test plugins are present.
$this->assertText('Test fetcher');
$this->assertText('Test parser');
diff --git a/core/modules/aggregator/lib/Drupal/aggregator/Tests/AggregatorTestBase.php b/core/modules/aggregator/lib/Drupal/aggregator/Tests/AggregatorTestBase.php
index 02063fc64870..437e7f7fdf52 100644
--- a/core/modules/aggregator/lib/Drupal/aggregator/Tests/AggregatorTestBase.php
+++ b/core/modules/aggregator/lib/Drupal/aggregator/Tests/AggregatorTestBase.php
@@ -31,7 +31,7 @@ function setUp() {
$this->drupalCreateContentType(array('type' => 'article', 'name' => 'Article'));
}
- $web_user = $this->drupalCreateUser(array('administer news feeds', 'access news feeds', 'create article content'));
+ $web_user = $this->drupalCreateUser(array('access administration pages', 'administer news feeds', 'access news feeds', 'create article content'));
$this->drupalLogin($web_user);
}
diff --git a/core/modules/image/lib/Drupal/image/Entity/ImageStyle.php b/core/modules/image/lib/Drupal/image/Entity/ImageStyle.php
index 2d9304cdd64a..ff0ea88ed3ef 100644
--- a/core/modules/image/lib/Drupal/image/Entity/ImageStyle.php
+++ b/core/modules/image/lib/Drupal/image/Entity/ImageStyle.php
@@ -267,9 +267,6 @@ public function flush($path = NULL) {
drupal_theme_rebuild();
// Clear page caches when flushing.
- if ($module_handler->moduleExists('block')) {
- \Drupal::cache('block')->deleteAll();
- }
\Drupal::cache('page')->deleteAll();
return $this;
}
--
GitLab