API Ensure themelist returns an array

creative-commoners · Nov 15, 2024 · 6937a2d · 6937a2d
1 parent 1a31282
commit 6937a2d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/Extensions/SiteTreeSubsites.php b/src/Extensions/SiteTreeSubsites.php
@@ -402,7 +402,8 @@ public static function contentcontrollerInit($controller)
         $subsite = Subsite::currentSubsite();
 
         if ($subsite && $subsite->Theme) {
-            SSViewer::set_themes(ThemeResolver::singleton()->getThemeList($subsite));
+            $themeList = ThemeResolver::singleton()->getThemeList($subsite);
+            SSViewer::set_themes($themeList);
         }
 
         $ignore_subsite_locale = Config::inst()->get(SiteTreeSubsites::class, 'ignore_subsite_locale');

diff --git a/src/Service/ThemeResolver.php b/src/Service/ThemeResolver.php
@@ -41,7 +41,7 @@ class ThemeResolver
      * @param Subsite $site
      * @return array
      */
-    public function getThemeList(Subsite $site)
+    public function getThemeList(Subsite $site): array
     {
         $themes = array_values(SSViewer::get_themes() ?? []);
         $siteTheme = $site->Theme;