diff options
Diffstat (limited to 'includes/installer/Installer.php')
| -rw-r--r-- | includes/installer/Installer.php | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php index 8101f7d6..ef484a8f 100644 --- a/includes/installer/Installer.php +++ b/includes/installer/Installer.php @@ -842,8 +842,13 @@ abstract class Installer { /** * Environment check for the server hostname. */ - protected function envCheckServer() { - $server = WebRequest::detectServer(); + protected function envCheckServer( $srv = null ) { + if ( $srv ) { + // wgServer was pre-defined, perhaps by the cli installer + $server = $srv; + } else { + $server = WebRequest::detectServer(); + } $this->showMessage( 'config-using-server', $server ); $this->setVar( 'wgServer', $server ); } |