Change KalathemeGetter to check for base theme first

drupalprojects · Jun 10, 2016 · 33f53c1 · 33f53c1
1 parent 1379a07
commit 33f53c1
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/src/Utility/KalathemeFrameworkGetter.php b/src/Utility/KalathemeFrameworkGetter.php
@@ -47,7 +47,15 @@ final public static function initialize() {
     // If not statitically set, then grab the active theme.
     if (!isset(static::$active_theme)) {
       // Initialize the active theme.
-      static::$active_theme = \Drupal::theme()->getActiveTheme()->getName();
+      // Make sure we are getting the base theme.
+      $base = \Drupal::theme()->getActiveTheme()->getBaseThemes();
+      if (count($base) > 0) {
+        static::$active_theme = reset($base);
+      }
+      // If for some reason we are on the base theme, grab it.
+      else {
+        static::$active_theme = \Drupal::theme()->getActiveTheme()->getName();
+      }
     }
 
     // If not statitically set, then grab the current framework.