Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

WebInstallerOptions: Don't ignore following options if an error is detected

Browse source 
Change-Id: I025db4624f653c4e52f84364b881c0eff485e069
This commit is contained in:
Bartosz Dziewoński 2014-07-02 20:29:42 +02:00
parent d37b1770ab
commit 1e01fa96bb
1 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
includes/installer/WebInstallerPage.php
View file

@ -1230,6 +1230,8 @@ class WebInstallerOptions extends WebInstallerPage {
'wgEmailAuthentication', 'wgMainCacheType', '_MemCachedServers',
'wgUseInstantCommons' ) );
$retVal = true;
if ( !array_key_exists( $this->getVar( '_RightsProfile' ), $this->parent->rightsProfiles )
) {
reset( $this->parent->rightsProfiles );
@ -1240,8 +1242,7 @@ class WebInstallerOptions extends WebInstallerPage {
if ( $code == 'cc-choose' ) {
if ( !$this->getVar( '_CCDone' ) ) {
$this->parent->showError( 'config-cc-not-chosen' );
return false;
$retVal = false;
}
} elseif ( array_key_exists( $code, $this->parent->licenses ) ) {
// Messages:
@ -1276,8 +1277,7 @@ class WebInstallerOptions extends WebInstallerPage {
$memcServers = explode( "\n", $this->getVar( '_MemCachedServers' ) );
if ( !$memcServers ) {
$this->parent->showError( 'config-memcache-needservers' );
return false;
$retVal = false;
}
foreach ( $memcServers as $server ) {
@ -1287,21 +1287,18 @@ class WebInstallerOptions extends WebInstallerPage {
&& ( gethostbyname( $memcParts[0] ) == $memcParts[0] ) )
) {
$this->parent->showError( 'config-memcache-badip', $memcParts[0] );
return false;
$retVal = false;
} elseif ( !isset( $memcParts[1] ) ) {
$this->parent->showError( 'config-memcache-noport', $memcParts[0] );
return false;
$retVal = false;
} elseif ( $memcParts[1] < 1 || $memcParts[1] > 65535 ) {
$this->parent->showError( 'config-memcache-badport', 1, 65535 );
return false;
$retVal = false;
}
}
}
return true;
return $retVal;
}
}