From: Roan Kattouw <catrope@users.mediawiki.org>
Date: Tue, 2 Feb 2010 01:02:16 +0000 (+0000)
Subject: Fix hardcoding of /skins in OutputPage::addJQuery()
X-Git-Tag: 1.31.0-rc.0~37981
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/password.php?a=commitdiff_plain;h=8dc8fa46b68f9246951e3598a50dbbf0a44fca14;p=lhc%2Fweb%2Fwiklou.git

Fix hardcoding of /skins in OutputPage::addJQuery()
---

diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index a37890596c..7a5e626d1a 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -2583,14 +2583,14 @@ class OutputPage {
 	 * @return Array: the list of modules which were not loaded.
 	 */
 	public function includeJQuery( $modules = array() ) {
-		global $wgScriptPath, $wgStyleVersion, $wgJsMimeType;
+		global $wgStylePath, $wgStyleVersion, $wgJsMimeType;
 
 		$supportedModules = array( /** TODO: add things here */ );
 		$unsupported = array_diff( $modules, $supportedModules );
 
 		$params = array(
 			'type' => $wgJsMimeType,
-			'src' => "$wgScriptPath/skins/common/jquery.min.js?$wgStyleVersion",
+			'src' => "$wgStylePath/jquery.min.js?$wgStyleVersion",
 		);
 		if ( !$this->mJQueryDone ) {
 			$this->mJQueryDone = true;