FIX Ensure themelist is not null

silverstripe · Nov 14, 2024 · bb73f02 · bb73f02
1 parent b6ba2b8
commit bb73f02
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/Extensions/SiteTreeSubsites.php b/src/Extensions/SiteTreeSubsites.php
@@ -402,7 +402,10 @@ public static function contentcontrollerInit($controller)
         $subsite = Subsite::currentSubsite();
 
         if ($subsite && $subsite->Theme) {
-            SSViewer::set_themes(ThemeResolver::singleton()->getThemeList($subsite));
+            $themeList = ThemeResolver::singleton()->getThemeList($subsite);
+            if (!is_null($themeList)) {
+                SSViewer::set_themes($themeList);
+            }
         }
 
         $ignore_subsite_locale = Config::inst()->get(SiteTreeSubsites::class, 'ignore_subsite_locale');