return parent::envCheckPath();
}
+ protected function envCheckServer( $srv = null ) {
+ if ( $this->getVar( 'wgServer' ) ) {
+ $srv = $this->getVar( 'wgServer' );
+ }
+ return parent::envCheckServer( $srv );
+ }
+
public function dirIsExecutable( $dir, $url ) {
$this->showMessage( 'config-no-cli-uploads-check', $dir );
return false;
/**
* Environment check for the server hostname.
*/
- protected function envCheckServer() {
- if ( $this->getVar( 'wgServer' ) ) {
+ protected function envCheckServer( $srv = null ) {
+ if ( $srv ) {
// wgServer was pre-defined, perhaps by the cli installer
- $server = $this->getVar( 'wgServer' );
+ $server = $srv;
} else {
$server = WebRequest::detectServer();
}