Bartosz Dziewoński has uploaded a new change for review.
https://gerrit.wikimedia.org/r/184088
Change subject: WebInstallerPage: Don't generate $wgDefaultSkin='' when no
skins are present during installation
......................................................................
WebInstallerPage: Don't generate $wgDefaultSkin='' when no skins are present
during installation
Change-Id: I025f1aeb182a818de59a42df01591e01fc9e6236
---
M includes/installer/WebInstallerPage.php
1 file changed, 5 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/88/184088/1
diff --git a/includes/installer/WebInstallerPage.php
b/includes/installer/WebInstallerPage.php
index 9ecb24b..828d50d 100644
--- a/includes/installer/WebInstallerPage.php
+++ b/includes/installer/WebInstallerPage.php
@@ -1035,12 +1035,13 @@
if ( $skins ) {
$skinNames = array_map( 'strtolower', $skins );
+ $chosenSkinName = $this->getVar( 'wgDefaultSkin',
$this->parent->getDefaultSkin( $skinNames ) );
$radioButtons = $this->parent->getRadioElements( array(
'var' => 'wgDefaultSkin',
'itemLabels' => array_fill_keys( $skinNames,
'config-skins-use-as-default' ),
'values' => $skinNames,
- 'value' => $this->getVar( 'wgDefaultSkin',
$this->parent->getDefaultSkin( $skinNames ) ),
+ 'value' => $chosenSkinName,
) );
foreach ( $skins as $skin ) {
@@ -1055,7 +1056,9 @@
'</div>';
}
} else {
- $skinHtml .= $this->parent->getWarningBox( wfMessage(
'config-skins-missing' )->plain() );
+ $skinHtml .=
+ $this->parent->getWarningBox( wfMessage(
'config-skins-missing' )->plain() ) .
+ Html::hidden( 'config_wgDefaultSkin',
$chosenSkinName );
}
$skinHtml .= $this->parent->getHelpBox( 'config-skins-help' ) .
--
To view, visit https://gerrit.wikimedia.org/r/184088
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I025f1aeb182a818de59a42df01591e01fc9e6236
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <matma....@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
