From f6d65e533c62f6deb21342d4901ece24497b433e Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Thu, 4 Jun 2015 07:31:04 +0200
Subject: Update to MediaWiki 1.25.1

---
 includes/installer/WebInstaller.php | 27 ++++++++++++++++++++-------
 1 file changed, 20 insertions(+), 7 deletions(-)

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

diff --git a/includes/installer/WebInstaller.php b/includes/installer/WebInstaller.php
index f3dba3a7..156606a6 100644
--- a/includes/installer/WebInstaller.php
+++ b/includes/installer/WebInstaller.php
@@ -1154,6 +1154,25 @@ class WebInstaller extends Installer {
 	 * @return bool
 	 */
 	public function envCheckPath() {
+		// PHP_SELF isn't available sometimes, such as when PHP is CGI but
+		// cgi.fix_pathinfo is disabled. In that case, fall back to SCRIPT_NAME
+		// to get the path to the current script... hopefully it's reliable. SIGH
+		$path = false;
+		if ( !empty( $_SERVER['PHP_SELF'] ) ) {
+			$path = $_SERVER['PHP_SELF'];
+		} elseif ( !empty( $_SERVER['SCRIPT_NAME'] ) ) {
+			$path = $_SERVER['SCRIPT_NAME'];
+		}
+		if ( $path === false ) {
+			$this->showError( 'config-no-uri' );
+			return false;
+		}
+
+		return parent::envCheckPath();
+	}
+
+	public function envPrepPath() {
+		parent::envPrepPath();
 		// PHP_SELF isn't available sometimes, such as when PHP is CGI but
 		// cgi.fix_pathinfo is disabled. In that case, fall back to SCRIPT_NAME
 		// to get the path to the current script... hopefully it's reliable. SIGH
@@ -1175,14 +1194,8 @@ class WebInstaller extends Installer {
 			$this->setVar( 'wgLocalStylePath', "$scriptPath/skins" );
 			$this->setVar( 'wgExtensionAssetsPath', "$scriptPath/extensions" );
 			$this->setVar( 'wgUploadPath', "$scriptPath/images" );
-
-		} else {
-			$this->showError( 'config-no-uri' );
-
-			return false;
+			$this->setVar( 'wgResourceBasePath', "$scriptPath" );
 		}
-
-		return parent::envCheckPath();
 	}
 
 	/**
-- 
cgit v1.2.3-54-g00ecf