diff --git a/core/lib/Drupal/Core/Entity/EntityViewBuilder.php b/core/lib/Drupal/Core/Entity/EntityViewBuilder.php index ebea735..7c9c5c3 100644 --- a/core/lib/Drupal/Core/Entity/EntityViewBuilder.php +++ b/core/lib/Drupal/Core/Entity/EntityViewBuilder.php @@ -371,7 +371,7 @@ public function resetCache(array $entities = NULL) { $tags = array_merge($tags, $entity->getCacheTags()); $tags = array_merge($tags, $entity->getEntityType()->getListCacheTags()); } - $tags = Cache::mergeTags($tags); + $tags = Cache::mergeTags($tags) Cache::invalidateTags($tags); } else { diff --git a/core/modules/views/src/Tests/RenderCacheIntegrationTest.php b/core/modules/views/src/Tests/RenderCacheIntegrationTest.php index a0fbfea..4a7e907 100644 --- a/core/modules/views/src/Tests/RenderCacheIntegrationTest.php +++ b/core/modules/views/src/Tests/RenderCacheIntegrationTest.php @@ -125,9 +125,9 @@ protected function assertCacheTagsForFieldBasedView($do_assert_views_caches) { $this->pass('Page 1'); \Drupal::request()->query->set('page', 0); $tags_page_1 = array_merge($base_tags, $entities[1]->getCacheTags()); - $tags_page_1 = array_merge($tags_page_1, $entities[2]->getCacheTags()); - $tags_page_1 = array_merge($tags_page_1, $entities[3]->getCacheTags()); - $tags_page_1 = array_merge($tags_page_1, $entities[4]->getCacheTags()); + $tags_page_1 = array_merge($tags_page_1, $entities[2]->getCacheTags() + $tags_page_1 = array_mergemergeTags($tags_page_1, $entities[3]->getCacheTags() + $tags_page_1 = array_merge($tags_page_1, $entities[4]->getCacheTags() $tags_page_1 = array_merge($tags_page_1, $entities[5]->getCacheTags()); $tags_page_1 = Cache::mergeTags($tags_page_1); $this->assertViewsCacheTags($view, $tags_page_1, $do_assert_views_caches, $tags_page_1);