X-Git-Url: http://www.aleph1.co.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=web%2Fcore%2Flib%2FDrupal%2FCore%2FTheme%2FThemeInitialization.php;fp=web%2Fcore%2Flib%2FDrupal%2FCore%2FTheme%2FThemeInitialization.php;h=5d429dd799a25d851669d918fccc4a52ac73a884;hb=0bf8d09d2542548982e81a441b1f16e75873a04f;hp=0067ee8710aedea0897382635ffdc5942672d285;hpb=74df008bdbb3a11eeea356744f39b802369bda3c;p=yaffs-website

diff --git a/web/core/lib/Drupal/Core/Theme/ThemeInitialization.php b/web/core/lib/Drupal/Core/Theme/ThemeInitialization.php
index 0067ee871..5d429dd79 100644
--- a/web/core/lib/Drupal/Core/Theme/ThemeInitialization.php
+++ b/web/core/lib/Drupal/Core/Theme/ThemeInitialization.php
@@ -173,6 +173,15 @@ class ThemeInitialization implements ThemeInitializationInterface {
     $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);