From b6fa1ca01a1d562b9c5a801431f9199389e727cb Mon Sep 17 00:00:00 2001
From: Nathaniel Catchpole <catch@35733.no-reply.drupal.org>
Date: Wed, 27 May 2015 08:46:50 +0100
Subject: [PATCH] Issue #2493091 by Wim Leers: Installing block module should
invalidate the 'rendered' cache tag
---
core/modules/block/block.module | 11 ++++++
.../block/src/Tests/BlockInstallTest.php | 38 +++++++++++++++++++
2 files changed, 49 insertions(+)
create mode 100644 core/modules/block/src/Tests/BlockInstallTest.php
diff --git a/core/modules/block/block.module b/core/modules/block/block.module
index 7bd79585264d..e65d07ab51a7 100644
--- a/core/modules/block/block.module
+++ b/core/modules/block/block.module
@@ -7,6 +7,7 @@
use Drupal\block\BlockInterface;
use Drupal\Component\Utility\Html;
+use Drupal\Core\Cache\Cache;
use Drupal\Core\Routing\RouteMatchInterface;
use Drupal\Core\Url;
use Drupal\language\ConfigurableLanguageInterface;
@@ -306,3 +307,13 @@ function block_configurable_language_delete(ConfigurableLanguageInterface $langu
}
}
}
+
+/**
+ * Implements hook_install().
+ */
+function block_install() {
+ // Because the Block module upon installation unconditionally overrides all
+ // HTML output by selecting a different page display variant, we must
+ // invalidate all cached HTML output.
+ Cache::invalidateTags(['rendered']);
+}
diff --git a/core/modules/block/src/Tests/BlockInstallTest.php b/core/modules/block/src/Tests/BlockInstallTest.php
new file mode 100644
index 000000000000..84819e6fe7da
--- /dev/null
+++ b/core/modules/block/src/Tests/BlockInstallTest.php
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * @file
+ * Contains \Drupal\block\Tests\BlockInstallTest.
+ */
+
+namespace Drupal\block\Tests;
+
+use Drupal\simpletest\WebTestBase;
+
+/**
+ * Tests block module's installation.
+ *
+ * @group block
+ */
+class BlockInstallTest extends WebTestBase {
+
+ public function testCacheTagInvalidationUponInstallation() {
+ // Warm the page cache.
+ $this->drupalGet('');
+ $this->assertNoText('Powered by Drupal');
+ $this->assertNoCacheTag('config:block_list');
+
+ // Install the block module, and place the "Powered by Drupal" block.
+ $this->container->get('module_installer')->install(['block', 'shortcut']);
+ $this->rebuildContainer();
+ $this->container->get('router.builder')->rebuild();
+ $this->drupalPlaceBlock('system_powered_by_block');
+
+ // Check the same page, block.module's hook_install() should have
+ // invalidated the 'rendered' cache tag to make blocks show up.
+ $this->drupalGet('');
+ $this->assertCacheTag('config:block_list');
+ $this->assertText('Powered by Drupal');
+ }
+
+}
--
GitLab