| Index: trunk/phase3/includes/installer/CliInstaller.php |
| — | — | @@ -183,6 +183,13 @@ |
| 184 | 184 | return parent::envCheckPath(); |
| 185 | 185 | } |
| 186 | 186 | |
| | 187 | + protected function envCheckServer( $srv = null ) { |
| | 188 | + if ( $this->getVar( 'wgServer' ) ) { |
| | 189 | + $srv = $this->getVar( 'wgServer' ); |
| | 190 | + } |
| | 191 | + return parent::envCheckServer( $srv ); |
| | 192 | + } |
| | 193 | + |
| 187 | 194 | public function dirIsExecutable( $dir, $url ) { |
| 188 | 195 | $this->showMessage( 'config-no-cli-uploads-check', $dir ); |
| 189 | 196 | return false; |
| Index: trunk/phase3/includes/installer/Installer.php |
| — | — | @@ -855,10 +855,10 @@ |
| 856 | 856 | /** |
| 857 | 857 | * Environment check for the server hostname. |
| 858 | 858 | */ |
| 859 | | - protected function envCheckServer() { |
| 860 | | - if ( $this->getVar( 'wgServer' ) ) { |
| | 859 | + protected function envCheckServer( $srv = null ) { |
| | 860 | + if ( $srv ) { |
| 861 | 861 | // wgServer was pre-defined, perhaps by the cli installer |
| 862 | | - $server = $this->getVar( 'wgServer' ); |
| | 862 | + $server = $srv; |
| 863 | 863 | } else { |
| 864 | 864 | $server = WebRequest::detectServer(); |
| 865 | 865 | } |