| Index: trunk/phase3/includes/installer/Installer.php |
| — | — | @@ -853,7 +853,12 @@ |
| 854 | 854 | * Environment check for the server hostname. |
| 855 | 855 | */ |
| 856 | 856 | protected function envCheckServer() { |
| 857 | | - $server = WebRequest::detectServer(); |
| | 857 | + if ( $this->getVar( 'wgServer' ) ) { |
| | 858 | + // wgServer was pre-defined, perhaps by the cli installer |
| | 859 | + $server = $this->getVar( 'wgServer' ); |
| | 860 | + } else { |
| | 861 | + $server = WebRequest::detectServer(); |
| | 862 | + } |
| 858 | 863 | $this->showMessage( 'config-using-server', $server ); |
| 859 | 864 | $this->setVar( 'wgServer', $server ); |
| 860 | 865 | } |
| Index: trunk/phase3/includes/installer/CliInstaller.php |
| — | — | @@ -27,6 +27,7 @@ |
| 28 | 28 | 'dbport' => 'wgDBport', |
| 29 | 29 | 'dbschema' => 'wgDBmwschema', |
| 30 | 30 | 'dbpath' => 'wgSQLiteDataDir', |
| | 31 | + 'server' => 'wgServer', |
| 31 | 32 | 'scriptpath' => 'wgScriptPath', |
| 32 | 33 | ); |
| 33 | 34 | |