From 3ad85bca5aeb3b09e192421441ff8729db207473 Mon Sep 17 00:00:00 2001
From: Chad Horohoe <demon@users.mediawiki.org>
Date: Thu, 9 Sep 2010 22:11:19 +0000
Subject: [PATCH] Fix jQuery loading

---
 includes/installer/WebInstallerOutput.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/includes/installer/WebInstallerOutput.php b/includes/installer/WebInstallerOutput.php
index ca58fe3cc0..da31412473 100644
--- a/includes/installer/WebInstallerOutput.php
+++ b/includes/installer/WebInstallerOutput.php
@@ -145,7 +145,7 @@ class WebInstallerOutput {
 	<?php echo Html::linkedStyle( '../skins/monobook/main.css' ) . "\n"; ?>
 	<?php echo Html::linkedStyle( '../skins/common/config.css' ) . "\n"; ?>
 	<?php echo Html::inlineScript(  "var dbTypes = " . Xml::encodeJsVar( $dbTypes ) ) . "\n"; ?>
-	<?php $this->outputJQuery() . "\n"; ?>
+	<?php echo $this->getJQuery() . "\n"; ?>
 	<?php echo Html::linkedScript( '../skins/common/config.js' ) . "\n"; ?>
 </head>
 
@@ -209,7 +209,7 @@ class WebInstallerOutput {
 	<title><?php $this->outputTitle(); ?></title>
 	<?php echo Html::linkedStyle( '../skins/monobook/main.css' ) . "\n"; ?>
 	<?php echo Html::linkedStyle( '../skins/common/config.css' ) . "\n"; ?>
-	<?php $this->outputJQuery(); ?>
+	<?php echo $this->getJQuery(); ?>
 	<?php echo Html::linkedScript( '../skins/common/config.js' ); ?>
 </head>
 
@@ -222,9 +222,8 @@ class WebInstallerOutput {
 		echo htmlspecialchars( wfMsg( 'config-title', $wgVersion ) );
 	}
 
-	public function outputJQuery() {
-		global $wgJQueryVersion;
-		echo Html::linkedScript( "../skins/common/jquery-$wgJQueryVersion.min.js" );
+	public function getJQuery() {
+		return Html::linkedScript( "../resources/jquery/jquery.js" );
 	}
 
 	public function outputWarnings() {
-- 
2.20.1