https://www.mediawiki.org/wiki/Special:Code/MediaWiki/102137
Revision: 102137 Author: dantman Date: 2011-11-06 01:15:25 +0000 (Sun, 06 Nov 2011) Log Message: ----------- Make the CliInstaller use --server to set wgServer instead of always setting it to "http://localhost"; Modified Paths: -------------- trunk/phase3/includes/installer/CliInstaller.php trunk/phase3/includes/installer/Installer.php Modified: trunk/phase3/includes/installer/CliInstaller.php =================================================================== --- trunk/phase3/includes/installer/CliInstaller.php 2011-11-06 01:09:07 UTC (rev 102136) +++ trunk/phase3/includes/installer/CliInstaller.php 2011-11-06 01:15:25 UTC (rev 102137) @@ -27,6 +27,7 @@ 'dbport' => 'wgDBport', 'dbschema' => 'wgDBmwschema', 'dbpath' => 'wgSQLiteDataDir', + 'server' => 'wgServer', 'scriptpath' => 'wgScriptPath', ); Modified: trunk/phase3/includes/installer/Installer.php =================================================================== --- trunk/phase3/includes/installer/Installer.php 2011-11-06 01:09:07 UTC (rev 102136) +++ trunk/phase3/includes/installer/Installer.php 2011-11-06 01:15:25 UTC (rev 102137) @@ -853,7 +853,12 @@ * 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 ); } _______________________________________________ MediaWiki-CVS mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
