From 224b22a051051f6c2e494c3a2fb4adb42898e2d1 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Tue, 14 Jan 2014 19:24:18 +0100
Subject: Update to MediaWiki 1.22.1

---
 includes/installer/LocalSettingsGenerator.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

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

diff --git a/includes/installer/LocalSettingsGenerator.php b/includes/installer/LocalSettingsGenerator.php
index 5c803d3e..53939826 100644
--- a/includes/installer/LocalSettingsGenerator.php
+++ b/includes/installer/LocalSettingsGenerator.php
@@ -145,7 +145,12 @@ class LocalSettingsGenerator {
 
 			$ip = $this->installer->getVar( 'IP' );
 			foreach ( $this->extensions as $ext) {
-				$path = str_replace( $ip, '$IP', $extensions[$ext]['path'] );
+				$path = str_replace( $ip, '', $extensions[$ext]['path'] );
+				$prefix = '';
+				if ( $path !== $extensions[$ext]['path'] ) {
+					$prefix = '$IP';
+				}
+				$path = $prefix . self::escapePhpString( $path );
 				$localSettings .= "require_once \"$path\";\n";
 			}
 		}
-- 
cgit v1.2.2