From 75f52155f2d55d0e2caecfe280817c5d317499ae Mon Sep 17 00:00:00 2001 From: Chad Horohoe Date: Tue, 7 Dec 2010 02:20:14 +0000 Subject: [PATCH] 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 --- includes/installer/CoreInstaller.php | 1 + includes/installer/LocalSettingsGenerator.php | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/includes/installer/CoreInstaller.php b/includes/installer/CoreInstaller.php index f4c76d20dd..32ab950902 100644 --- 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 b7a8d778df..4342a176c2 100644 --- 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 -- 2.20.1