From: Roan Kattouw <catrope@users.mediawiki.org>
Date: Wed, 3 Feb 2010 10:48:11 +0000 (+0000)
Subject: Use wfAppendQuery() instead of "$path?$wgStyleVersion" where $path can contain ?foo... 
X-Git-Tag: 1.31.0-rc.0~37955
X-Git-Url: http://git.cyclocoop.org/%28?a=commitdiff_plain;h=76dfc155396b2554c1c2c47be9d02b7a7b33461b;p=lhc%2Fweb%2Fwiklou.git

Use wfAppendQuery() instead of "$path?$wgStyleVersion" where $path can contain ?foo=bar&bar=baz . This fixes the bug where MediaWiki:Monobook.js was included on every page and the JS variable skin was always set to 'monobook'; this happened because of &useskin=vector?265
---

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 9f2ba3998f..93fde209b1 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -191,7 +191,7 @@ class OutputPage {
 		} else {
 			$path =  "{$wgStylePath}/common/{$file}";
 		}
-		$this->addScript( Html::linkedScript( "$path?$wgStyleVersion" ) );
+		$this->addScript( Html::linkedScript( wfAppendQuery( $path, $wgStyleVersion ) ) );
 	}
 
 	/**