From c1f9b1f7b1b77776192048005dcc66dcf3df2bfb Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Sat, 27 Dec 2014 15:41:37 +0100 Subject: Update to MediaWiki 1.24.1 --- includes/installer/CliInstaller.php | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) (limited to 'includes/installer/CliInstaller.php') diff --git a/includes/installer/CliInstaller.php b/includes/installer/CliInstaller.php index f944fbed..72907408 100644 --- a/includes/installer/CliInstaller.php +++ b/includes/installer/CliInstaller.php @@ -49,9 +49,9 @@ class CliInstaller extends Installer { /** * Constructor. * - * @param $siteName - * @param $admin - * @param $option Array + * @param string $siteName + * @param string $admin + * @param array $option */ function __construct( $siteName, $admin = null, array $option = array() ) { global $wgContLang; @@ -107,6 +107,15 @@ class CliInstaller extends Installer { if ( isset( $option['pass'] ) ) { $this->setVar( '_AdminPassword', $option['pass'] ); } + + // Set up the default skins + $skins = $this->findExtensions( 'skins' ); + $this->setVar( '_Skins', $skins ); + + if ( $skins ) { + $skinNames = array_map( 'strtolower', $skins ); + $this->setVar( 'wgDefaultSkin', $this->getDefaultSkin( $skinNames ) ); + } } /** @@ -138,7 +147,8 @@ class CliInstaller extends Installer { public function startStage( $step ) { // Messages: config-install-database, config-install-tables, config-install-interwiki, - // config-install-stats, config-install-keys, config-install-sysop, config-install-mainpage + // config-install-stats, config-install-keys, config-install-sysop, config-install-mainpage, + // config-install-extensions $this->showMessage( "config-install-$step" ); } @@ -158,7 +168,7 @@ class CliInstaller extends Installer { } /** - * @param $params array + * @param array $params * * @return string */ -- cgit v1.2.3-54-g00ecf