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 8c8e7c8..015ac53 100644 (file)
--- 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 2a3c1c9..f62470e 100644 (file)
--- 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' );