diff --git a/core/modules/color/color.module b/core/modules/color/color.module index 98678f7..019ab29 100644 --- a/core/modules/color/color.module +++ b/core/modules/color/color.module @@ -112,7 +112,8 @@ function color_library_info_alter(&$libraries, $extension) { */ function color_preprocess_page(&$variables) { $theme_key = \Drupal::theme()->getActiveTheme()->getName(); - + $site_config = \Drupal::config('system.site'); + $variables['logo'] = $site_config->get('logo'); // Override logo. $logo = \Drupal::config('color.theme.' . $theme_key)->get('logo'); if ($logo && $variables['logo'] && preg_match('!' . $theme_key . '/logo.svg$!', $variables['logo'])) { diff --git a/core/modules/system/src/Tests/Cache/PageCacheTagsIntegrationTest.php b/core/modules/system/src/Tests/Cache/PageCacheTagsIntegrationTest.php index f4d30ec..6d5f9f2 100644 --- a/core/modules/system/src/Tests/Cache/PageCacheTagsIntegrationTest.php +++ b/core/modules/system/src/Tests/Cache/PageCacheTagsIntegrationTest.php @@ -92,6 +92,7 @@ function testPageCacheTags() { 'config:block.block.bartik_main_menu', 'config:block.block.bartik_account_menu', 'config:block.block.bartik_messages', + 'config:block.block.bartik_branding', 'node_view', 'node:' . $node_1->id(), 'user:' . $author_1->id(), @@ -118,6 +119,7 @@ function testPageCacheTags() { 'config:block.block.bartik_main_menu', 'config:block.block.bartik_account_menu', 'config:block.block.bartik_messages', + 'config:block.block.bartik_branding', 'node_view', 'node:' . $node_2->id(), 'user:' . $author_2->id(), diff --git a/core/themes/seven/seven.theme b/core/themes/seven/seven.theme index 5d13503..e0687e7 100644 --- a/core/themes/seven/seven.theme +++ b/core/themes/seven/seven.theme @@ -146,6 +146,7 @@ function seven_element_info_alter(&$type) { * Implements hook_preprocess_install_page(). */ function seven_preprocess_install_page(&$variables) { + $site_config = \Drupal::config('system.site'); // Seven has custom styling for the install page. $variables['#attached']['library'][] = 'seven/install-page'; $variables['site_name'] = String::checkPlain($site_config->get('name')); @@ -155,6 +156,7 @@ function seven_preprocess_install_page(&$variables) { * Implements hook_preprocess_maintenance_page(). */ function seven_preprocess_maintenance_page(&$variables) { + $site_config = \Drupal::config('system.site'); // Seven has custom styling for the maintenance page. $variables['#attached']['library'][] = 'seven/maintenance-page'; $variables['site_name'] = String::checkPlain($site_config->get('name'));