Make the CliInstaller use --server to set wgServer instead of always setting it to...

diff --git a/includes/installer/CliInstaller.php b/includes/installer/CliInstaller.php
index 002dfcf..fb7baa4 100644 (file)
--- a/includes/installer/CliInstaller.php
+++ b/includes/installer/CliInstaller.php
@@ -27,6 +27,7 @@ class CliInstaller extends Installer {
                'dbport' => 'wgDBport',
                'dbschema' => 'wgDBmwschema',
                'dbpath' => 'wgSQLiteDataDir',
+               'server' => 'wgServer',
                'scriptpath' => 'wgScriptPath',
        );
 

diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index 7b68283..d8afba1 100644 (file)
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -853,7 +853,12 @@ abstract class Installer {
         * Environment check for the server hostname.
         */
        protected function envCheckServer() {
-               $server = WebRequest::detectServer();
+               if ( $this->getVar( 'wgServer' ) ) {
+                       // wgServer was pre-defined, perhaps by the cli installer
+                       $server = $this->getVar( 'wgServer' );
+               } else {
+                       $server = WebRequest::detectServer();
+               }
                $this->showMessage( 'config-using-server', $server );
                $this->setVar( 'wgServer', $server );
        }