diff core/lib/Drupal/Core/Theme/ThemeInitialization.php @ 5:12f9dff5fda9 tip

Update to Drupal core 8.7.1

--- a/core/lib/Drupal/Core/Theme/ThemeInitialization.php	Thu Feb 28 13:11:55 2019 +0000
+++ b/core/lib/Drupal/Core/Theme/ThemeInitialization.php	Thu May 09 15:34:47 2019 +0100
@@ -140,18 +140,18 @@
       include_once $this->root . '/' . $active_theme->getOwner();
 
       if (function_exists($theme_engine . '_init')) {
-        foreach ($active_theme->getBaseThemes() as $base) {
-          call_user_func($theme_engine . '_init', $base->getExtension());
+        foreach ($active_theme->getBaseThemeExtensions() as $base) {
+          call_user_func($theme_engine . '_init', $base);
         }
         call_user_func($theme_engine . '_init', $active_theme->getExtension());
       }
     }
     else {
       // include non-engine theme files
-      foreach ($active_theme->getBaseThemes() as $base) {
+      foreach ($active_theme->getBaseThemeExtensions() as $base) {
         // Include the theme file or the engine.
-        if ($base->getOwner()) {
-          include_once $this->root . '/' . $base->getOwner();
+        if ($base->owner) {
+          include_once $this->root . '/' . $base->owner;
         }
       }
       // and our theme gets one too.
@@ -260,10 +260,10 @@
 
     $base_active_themes = [];
     foreach ($base_themes as $base_theme) {
-      $base_active_themes[$base_theme->getName()] = $this->getActiveTheme($base_theme, array_slice($base_themes, 1));
+      $base_active_themes[$base_theme->getName()] = $base_theme;
     }
 
-    $values['base_themes'] = $base_active_themes;
+    $values['base_theme_extensions'] = $base_active_themes;
     if (!empty($theme->info['regions'])) {
       $values['regions'] = $theme->info['regions'];
     }