Address fixme on r67621: use $wgDefaultSkin instead of hardcoding vector

Would like a UI to choose skin with like previews or something, but its not urgent

diff --git a/includes/installer/CoreInstaller.php b/includes/installer/CoreInstaller.php
index f4c76d2..32ab950 100644 (file)
--- a/includes/installer/CoreInstaller.php
+++ b/includes/installer/CoreInstaller.php
@@ -49,6 +49,7 @@ abstract class CoreInstaller extends Installer {
                'wgSecretKey',
                'wgUseInstantCommons',
                'wgUpgradeKey',
+               'wgDefaultSkin',
        );
 
        /**

diff --git a/includes/installer/LocalSettingsGenerator.php b/includes/installer/LocalSettingsGenerator.php
index b7a8d77..4342a17 100644 (file)
--- a/includes/installer/LocalSettingsGenerator.php
+++ b/includes/installer/LocalSettingsGenerator.php
@@ -45,7 +45,7 @@ class LocalSettingsGenerator {
                                'wgDBtype', 'wgSecretKey', 'wgRightsUrl', 'wgSitename', 'wgRightsIcon',
                                'wgRightsText', 'wgRightsCode', 'wgMainCacheType', 'wgEnableUploads',
                                'wgMainCacheType', '_MemCachedServers', 'wgDBserver', 'wgDBuser',
-                               'wgDBpassword', 'wgUseInstantCommons', 'wgUpgradeKey'
+                               'wgDBpassword', 'wgUseInstantCommons', 'wgUpgradeKey', 'wgDefaultSkin',
                        ),
                        $db->getGlobalNames()
                );
@@ -286,7 +286,7 @@ if ( !defined( 'MEDIAWIKI' ) ) {
 
 ## Default skin: you can change the default skin. Use the internal symbolic
 ## names, ie 'standard', 'nostalgia', 'cologneblue', 'monobook', 'vector':
-\$wgDefaultSkin = 'vector';
+\$wgDefaultSkin = \"{$this->values['wgDefaultSkin']}\";
 
 ## For attaching licensing metadata to pages, and displaying an
 ## appropriate copyright notice / icon. GNU Free Documentation