From: Max Semenik <maxsem@users.mediawiki.org>
Date: Sat, 26 Feb 2011 12:51:35 +0000 (+0000)
Subject: Follow-up r82845: fix $wgScriptPath detection.
X-Git-Tag: 1.31.0-rc.0~31761
X-Git-Url: https://git.cyclocoop.org/%28%28?a=commitdiff_plain;h=00a59be5e1cbedb081687fb602744bd3afa492dc;p=lhc%2Fweb%2Fwiklou.git

Follow-up r82845: fix $wgScriptPath detection.
---

diff --git a/includes/installer/Installer.php b/includes/installer/Installer.php
index af21572d69..013ce6c5c0 100644
--- a/includes/installer/Installer.php
+++ b/includes/installer/Installer.php
@@ -837,7 +837,7 @@ abstract class Installer {
 			return false;
 		}
 
-		$uri = preg_replace( '{^(.*)/config.*$}', '$1', $path );
+		$uri = preg_replace( '{^(.*)/(mw-)?config.*$}', '$1', $path );
 		$this->setVar( 'wgScriptPath', $uri );
 	}