From ba0fc4fa20067528effd4802e53ceeb959640825 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Thu, 12 Jan 2012 13:42:29 +0100
Subject: Update to MediaWiki 1.18.1

---
 includes/installer/Installer.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'includes/installer/Installer.php')

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 );
 	}
-- 
cgit v1.2.2