From 470723adec22a8340e40906a15c4d612383d906c Mon Sep 17 00:00:00 2001
From: addshore <git@addshore.com>
Date: Wed, 30 Sep 2026 07:44:11 +0100
Subject: [PATCH] Load Modern only for existing defaults

Load Modern only when the wiki default is modern. Keep the skin packaged
for those wikis and update both authoritative and generated
LocalSettings files.

Bug: T418562
---
 .../wbstack/src/Settings/LocalSettings.php         | 14 ++++++++------
 dist/wbstack/src/Settings/LocalSettings.php        | 14 ++++++++------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/dist-persist/wbstack/src/Settings/LocalSettings.php b/dist-persist/wbstack/src/Settings/LocalSettings.php
index ee439028e9..01250ab63b 100644
--- a/dist-persist/wbstack/src/Settings/LocalSettings.php
+++ b/dist-persist/wbstack/src/Settings/LocalSettings.php
@@ -360,18 +360,20 @@ function onBeforePageDisplay( &$out, &$skin ) {
 #######################################
 ## ---          Skins            --- ##
 #######################################
-wfLoadSkin( 'Vector' );
-wfLoadSkin( 'Timeless' );
-wfLoadSkin( 'Modern' );
-wfLoadSkin( 'MinervaNeue' );
-
-// TODO allow turning some skins on and off?
 $wgDefaultSkin = $wikiInfo->getSetting('wgDefaultSkin');
 if( $wgDefaultSkin === null ) {
     // Fallback to vector
     $wgDefaultSkin = "vector";
 }
 
+wfLoadSkin( 'Vector' );
+wfLoadSkin( 'Timeless' );
+if( $wgDefaultSkin === 'modern' ) {
+    wfLoadSkin( 'Modern' );
+}
+wfLoadSkin( 'MinervaNeue' );
+
+// TODO allow turning some skins on and off?
 #######################################
 ## ---        Extensions         --- ##
 #######################################
diff --git a/dist/wbstack/src/Settings/LocalSettings.php b/dist/wbstack/src/Settings/LocalSettings.php
index ee439028e9..01250ab63b 100644
--- a/dist/wbstack/src/Settings/LocalSettings.php
+++ b/dist/wbstack/src/Settings/LocalSettings.php
@@ -360,18 +360,20 @@ function onBeforePageDisplay( &$out, &$skin ) {
 #######################################
 ## ---          Skins            --- ##
 #######################################
-wfLoadSkin( 'Vector' );
-wfLoadSkin( 'Timeless' );
-wfLoadSkin( 'Modern' );
-wfLoadSkin( 'MinervaNeue' );
-
-// TODO allow turning some skins on and off?
 $wgDefaultSkin = $wikiInfo->getSetting('wgDefaultSkin');
 if( $wgDefaultSkin === null ) {
     // Fallback to vector
     $wgDefaultSkin = "vector";
 }
 
+wfLoadSkin( 'Vector' );
+wfLoadSkin( 'Timeless' );
+if( $wgDefaultSkin === 'modern' ) {
+    wfLoadSkin( 'Modern' );
+}
+wfLoadSkin( 'MinervaNeue' );
+
+// TODO allow turning some skins on and off?
 #######################################
 ## ---        Extensions         --- ##
 #######################################