commit 0e72f25bd9df3fb0061ba4ff3d893faf38953be5 Author: Joel Pittet Date: Thu May 14 16:25:26 2015 -0700 cache tags diff --git a/core/includes/theme.inc b/core/includes/theme.inc index 2382748..2fe05d5 100644 --- a/core/includes/theme.inc +++ b/core/includes/theme.inc @@ -1372,8 +1372,8 @@ function template_preprocess_page(&$variables) { $variables['front_page'] = \Drupal::url(''); $variables['language'] = $language_interface; $variables['logo'] = theme_get_setting('logo.url'); - $variables['site_name'] = (theme_get_setting('features.name') ? $site_config->get('name') : ''); - $variables['site_slogan'] = (theme_get_setting('features.slogan') ? $site_config->get('slogan') : ''); + $variables['site_name'] = $site_config->get('name'); + $variables['site_slogan'] = $site_config->get('slogan'); // An exception might be thrown. try { diff --git a/core/modules/page_cache/src/Tests/PageCacheTagsIntegrationTest.php b/core/modules/page_cache/src/Tests/PageCacheTagsIntegrationTest.php index cd38de6..7ec3838 100644 --- a/core/modules/page_cache/src/Tests/PageCacheTagsIntegrationTest.php +++ b/core/modules/page_cache/src/Tests/PageCacheTagsIntegrationTest.php @@ -86,6 +86,7 @@ function testPageCacheTags() { 'rendered', 'block_view', 'config:block_list', + 'config:block.block.bartik_branding', 'config:block.block.bartik_breadcrumbs', 'config:block.block.bartik_content', 'config:block.block.bartik_tools', @@ -118,6 +119,7 @@ function testPageCacheTags() { 'rendered', 'block_view', 'config:block_list', + 'config:block.block.bartik_branding', 'config:block.block.bartik_breadcrumbs', 'config:block.block.bartik_content', 'config:block.block.bartik_tools',