diff options
| author | Pierre Schmitz <pierre@archlinux.de> | 2014-01-14 19:24:18 +0100 |
|---|---|---|
| committer | Pierre Schmitz <pierre@archlinux.de> | 2014-01-14 19:24:18 +0100 |
| commit | 224b22a051051f6c2e494c3a2fb4adb42898e2d1 (patch) | |
| tree | 85a41a4cf8533bf740ec4c8d3affce88414daa56 /includes/installer/LocalSettingsGenerator.php | |
| parent | 9937b8e6d6a8b4517c04c143daaf9ebd42ce8ba0 (diff) | |
Update to MediaWiki 1.22.1
Diffstat (limited to 'includes/installer/LocalSettingsGenerator.php')
| -rw-r--r-- | includes/installer/LocalSettingsGenerator.php | 7 |
1 files changed, 6 insertions, 1 deletions
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"; } } |