From: Timo Tijhof <krinklemail@gmail.com>
Date: Thu, 10 Jul 2014 16:32:52 +0000 (+0200)
Subject: installer: Recompute wgStylePath etc. after setting wgScriptPath
X-Git-Tag: 1.31.0-rc.0~14972^2
X-Git-Url: http://git.cyclocoop.org/%22%2C%20generer_url_ecrire%28?a=commitdiff_plain;h=2bd62bae996af13fb37263a6d15b348db1cb1fd6;p=lhc%2Fweb%2Fwiklou.git

installer: Recompute wgStylePath etc. after setting wgScriptPath

Bug: 67810
Change-Id: I95d02b41222d25fe216453c1d795475d4acdead5
---

diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index 8c8e7c83e2..015ac53d17 100644
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -146,9 +146,9 @@ abstract class Installer {
 	 * @var array
 	 */
 	protected $envPreps = array(
+		'envPrepExtension',
 		'envPrepServer',
 		'envPrepPath',
-		'envPrepExtension',
 	);
 
 	/**
diff --git a/includes/installer/WebInstaller.php b/includes/installer/WebInstaller.php
index 2a3c1c9add..f62470eec4 100644
--- a/includes/installer/WebInstaller.php
+++ b/includes/installer/WebInstaller.php
@@ -1136,7 +1136,16 @@ class WebInstaller extends Installer {
 		}
 		if ( $path !== false ) {
 			$scriptPath = preg_replace( '{^(.*)/(mw-)?config.*$}', '$1', $path );
+			$scriptExtension = $this->getVar( 'wgScriptExtension' );
+
 			$this->setVar( 'wgScriptPath', "$scriptPath" );
+			// Update variables set from Setup.php that are derived from wgScriptPath
+			$this->setVar( 'wgScript', "$scriptPath/index$scriptExtension" );
+			$this->setVar( 'wgLoadScript', "$scriptPath/load$scriptExtension" );
+			$this->setVar( 'wgStylePath', "$scriptPath/skins" );
+			$this->setVar( 'wgLocalStylePath', "$scriptPath/skins" );
+			$this->setVar( 'wgExtensionAssetsPath', "$scriptPath/extensions" );
+			$this->setVar( 'wgUploadPath', "$scriptPath/images" );
 
 		} else {
 			$this->showError( 'config-no-uri' );