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

Merge "maintenance: Document secondary purpose of --server"

Browse source
This commit is contained in:
jenkins-bot 2018-04-12 18:56:42 +00:00 committed by Gerrit Code Review
commit 9b670fb797
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
maintenance/Maintenance.php
View file

@ -1215,6 +1215,12 @@ abstract class Maintenance {
}
define( 'MW_DB', $bits[0] );
define( 'MW_PREFIX', $bits[1] );
} elseif ( isset( $this->mOptions['server'] ) ) {
// Provide the option for site admins to detect and configure
// multiple wikis based on server names. This offers --server
// as alternative to --wiki.
// See https://www.mediawiki.org/wiki/Manual:Wiki_family
$_SERVER['SERVER_NAME'] = $this->mOptions['server'];
}
if ( !is_readable( $settingsFile ) ) {
@ -1222,9 +1228,6 @@ abstract class Maintenance {
"must exist and be readable in the source directory.\n" .
"Use --conf to specify it." );
}
if ( isset( $this->mOptions['server'] ) ) {
$_SERVER['SERVER_NAME'] = $this->mOptions['server'];
}
$wgCommandLineMode = true;
return $settingsFile;