diff -u b/core/includes/theme.inc b/core/includes/theme.inc --- b/core/includes/theme.inc +++ b/core/includes/theme.inc @@ -1309,9 +1309,4 @@ $language_interface = \Drupal::languageManager()->getCurrentLanguage(); - // $site_config only needed on maintenance and install paths. - if (defined('MAINTENANCE_MODE')) { - $site_config = \Drupal::config('system.site'); - } - // Move some variables to the top level for themer convenience and template cleanliness. $variables['title'] = $variables['page']['#title']; @@ -1327,11 +1322,4 @@ $variables['language'] = $language_interface; - // Only generate branding variables on maintenance and install paths. - if (defined('MAINTENANCE_MODE')) { - $variables['logo'] = theme_get_setting('logo.url'); - $variables['site_name'] = $site_config->get('name'); - $variables['site_slogan'] = $site_config->get('slogan'); - } - // An exception might be thrown. try { @@ -1444,6 +1432,13 @@ // @see system_page_attachments() $variables['#attached']['library'][] = 'system/maintenance'; + + // Maintenance page and install page need branding info in variables because + // there is no blocks. + $site_config = \Drupal::config('system.site'); + $variables['logo'] = theme_get_setting('logo.url'); + $variables['site_name'] = $site_config->get('name'); + $variables['site_slogan'] = $site_config->get('slogan'); } /** diff -u b/core/modules/color/color.module b/core/modules/color/color.module --- b/core/modules/color/color.module +++ b/core/modules/color/color.module @@ -108,21 +108,6 @@ } /** - * Implements hook_preprocess_page(). - * - * Replace the logo with the colored version if available. - */ -function color_preprocess_page(&$variables) { - $theme_key = \Drupal::theme()->getActiveTheme()->getName(); - - // Override logo. - $logo = \Drupal::config('color.theme.' . $theme_key)->get('logo'); - if ($logo && $variables['logo'] && preg_match('!' . $theme_key . '/logo.svg$!', $variables['logo'])) { - $variables['logo'] = file_create_url($logo); - } -} - -/** * Implements hook_block_view_BASE_BLOCK_ID_alter(). */ function color_block_view_system_branding_block_alter(array &$build, BlockPluginInterface $block) {