From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Wed, 24 Jan 2018 15:24:57 +0000 (+0000)
Subject: Merge "Set $_SERVER['SERVER_NAME'] to the value set by --server"
X-Git-Tag: 1.31.0-rc.0~813
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=07a791ffd1d80c6a8f2ca4dfdbc3f2002ac869fe

Merge "Set $_SERVER['SERVER_NAME'] to the value set by --server"
---

07a791ffd1d80c6a8f2ca4dfdbc3f2002ac869fe
diff --cc maintenance/Maintenance.php
index 5adbee5fc3,ec5499363e..86336cf6ae
--- a/maintenance/Maintenance.php
+++ b/maintenance/Maintenance.php
@@@ -1203,10 -1166,13 +1203,13 @@@ abstract class Maintenance 
  		}
  
  		if ( !is_readable( $settingsFile ) ) {
 -			$this->error( "A copy of your installation's LocalSettings.php\n" .
 +			$this->fatalError( "A copy of your installation's LocalSettings.php\n" .
  				"must exist and be readable in the source directory.\n" .
 -				"Use --conf to specify it.", true );
 +				"Use --conf to specify it." );
  		}
+ 		if ( isset( $this->mOptions['server'] ) ) {
+ 			$_SERVER['SERVER_NAME'] = $this->mOptions['server'];
+ 		}
  		$wgCommandLineMode = true;
  
  		return $settingsFile;