diff --git a/core/modules/block/src/BlockRepository.php b/core/modules/block/src/BlockRepository.php index 42c5770..ddea5fe 100644 --- a/core/modules/block/src/BlockRepository.php +++ b/core/modules/block/src/BlockRepository.php @@ -91,7 +91,7 @@ public function getVisibleBlocksPerRegion(array &$cacheable_metadata = []) { $context_cache_keys = $this->cacheContextsManager->convertTokensToKeys($cache->data); $cid = 'blocks:' . $active_theme->getName() . ':redirect:' . implode(':', $context_cache_keys->getKeys()); if ($cache_redirect = $this->cache->get($cid)) { - $cacheable_metadata = $cache_redirect->data['cacheable_metadata']; + $cacheability = $cache_redirect->data['cacheable_metadata']; return $cache_redirect->data['assignments']; } } @@ -100,8 +100,8 @@ public function getVisibleBlocksPerRegion(array &$cacheable_metadata = []) { $empty = array_fill_keys($active_theme->getRegions(), array()); $full = array(); - $overall_cacheablity_metadata = new CacheableMetadata(); - $overall_cacheablity_metadata->addCacheTags(['config:block_list']); + $overall_cacheability_metadata = new CacheableMetadata(); + $overall_cacheability_metadata->addCacheTags(['config:block_list']); foreach ($this->blockStorage->loadByProperties(array('theme' => $active_theme->getName())) as $block_id => $block) { /** @var \Drupal\block\BlockInterface $block */ $access = $block->access('view', NULL, TRUE); @@ -127,20 +127,20 @@ public function getVisibleBlocksPerRegion(array &$cacheable_metadata = []) { @uasort($assignment, 'Drupal\block\Entity\Block::sort'); } - foreach ($cacheable_metadata as $cacheable_metadata_region) { - $overall_cacheablity_metadata = $overall_cacheablity_metadata->merge($cacheable_metadata_region); + foreach ($cacheability as $region_cacheability) { + $overall_cacheability_metadata = $overall_cacheability_metadata->merge($region_cacheability); } - $contexts = $overall_cacheablity_metadata->getCacheContexts(); + $contexts = $overall_cacheability_metadata->getCacheContexts(); $merged_contexts = $cache ? array_unique(array_merge($contexts, $cache->data)) : $contexts; if (empty($cache) || array_diff($contexts, $cache->data)) { $this->cache->set('blocks:' . $active_theme->getName(), $merged_contexts); } $context_cache_keys = $this->cacheContextsManager->convertTokensToKeys($merged_contexts); - $overall_cacheablity_metadata = $overall_cacheablity_metadata->merge($context_cache_keys); + $overall_cacheability_metadata = $overall_cacheability_metadata->merge($context_cache_keys); $cid = 'blocks:' . $active_theme->getName() . ':redirect:' . implode(':', $context_cache_keys->getKeys()); - $this->cache->set($cid, ['assignments' => $assignments, 'cacheable_metadata' => $cacheable_metadata], $this->maxAgeToExpire($context_cache_keys->getCacheMaxAge()), $overall_cacheablity_metadata->getCacheTags()); + $this->cache->set($cid, ['assignments' => $assignments, 'cacheable_metadata' => $cacheable_metadata], $this->maxAgeToExpire($context_cache_keys->getCacheMaxAge()), $overall_cacheability_metadata->getCacheTags()); return $assignments; }