refactor: handle empty theme sets after reading cache

wiki-gg-oss · May 23, 2024 · 0abc5c4 · 0abc5c4
1 parent 235aed7
commit 0abc5c4
Showing 1 changed file with 13 additions and 13 deletions.
diff --git a/includes/ThemeAndFeatureRegistry.php b/includes/ThemeAndFeatureRegistry.php
@@ -30,7 +30,7 @@ class ThemeAndFeatureRegistry {
         ConfigNames::DisableAutoDetection,
     ];
 
-    public const CACHE_GENERATION = 10;
+    public const CACHE_GENERATION = 11;
     public const CACHE_TTL = 24 * 60 * 60;
     public const TITLE = 'Theme-definitions';
 
@@ -226,6 +226,18 @@ function ( $old, &$ttl, &$setOpts ) {
                     );
             } );
 
+            if ( empty( $options ) ) {
+                // This should match default Theme-definitions message
+                $themes = [
+                    'none' => [
+                        'id' => 'none',
+                        'default' => true,
+                        'in-site-css' => true,
+                        'kind' => 'unknown',
+                    ]
+                ];
+            }
+
             // Construct ThemeInfo objects
             $this->infos = array_map( fn ( $info ) => new ThemeInfo( $info ), $options );
             $this->ids = array_keys( $this->infos );
@@ -261,18 +273,6 @@ private function fetchDefinitionList(): array {
             }
         }
 
-        if ( empty( $themes ) ) {
-            // This should match default Theme-definitions message
-            $themes = [
-                'none' => [
-                    'id' => 'none',
-                    'default' => true,
-                    'in-site-css' => true,
-                    'kind' => 'unknown',
-                ]
-            ];
-        }
-
         return $themes;
     }