diff core/lib/Drupal/Core/Theme/ThemeInitialization.php @ 17:129ea1e6d783

Update, including to Drupal core 8.6.10

--- a/core/lib/Drupal/Core/Theme/ThemeInitialization.php	Tue Jul 10 15:07:59 2018 +0100
+++ b/core/lib/Drupal/Core/Theme/ThemeInitialization.php	Thu Feb 28 13:21:36 2019 +0000
@@ -173,6 +173,15 @@
     $values['path'] = $theme_path;
     $values['name'] = $theme->getName();
 
+    // Use the logo declared in this themes info file, otherwise use logo.svg
+    // from the themes root.
+    if (!empty($theme->info['logo'])) {
+      $values['logo'] = $theme->getPath() . '/' . $theme->info['logo'];
+    }
+    else {
+      $values['logo'] = $theme->getPath() . '/logo.svg';
+    }
+
     // @todo Remove in Drupal 9.0.x.
     $values['stylesheets_remove'] = $this->prepareStylesheetsRemove($theme, $base_themes);