| Index: trunk/phase3/includes/installer/WebInstallerOutput.php |
| — | — | @@ -145,7 +145,7 @@ |
| 146 | 146 | <?php echo Html::linkedStyle( '../skins/monobook/main.css' ) . "\n"; ?> |
| 147 | 147 | <?php echo Html::linkedStyle( '../skins/common/config.css' ) . "\n"; ?> |
| 148 | 148 | <?php echo Html::inlineScript( "var dbTypes = " . Xml::encodeJsVar( $dbTypes ) ) . "\n"; ?> |
| 149 | | - <?php $this->outputJQuery() . "\n"; ?> |
| | 149 | + <?php echo $this->getJQuery() . "\n"; ?> |
| 150 | 150 | <?php echo Html::linkedScript( '../skins/common/config.js' ) . "\n"; ?> |
| 151 | 151 | </head> |
| 152 | 152 | |
| — | — | @@ -209,7 +209,7 @@ |
| 210 | 210 | <title><?php $this->outputTitle(); ?></title> |
| 211 | 211 | <?php echo Html::linkedStyle( '../skins/monobook/main.css' ) . "\n"; ?> |
| 212 | 212 | <?php echo Html::linkedStyle( '../skins/common/config.css' ) . "\n"; ?> |
| 213 | | - <?php $this->outputJQuery(); ?> |
| | 213 | + <?php echo $this->getJQuery(); ?> |
| 214 | 214 | <?php echo Html::linkedScript( '../skins/common/config.js' ); ?> |
| 215 | 215 | </head> |
| 216 | 216 | |
| — | — | @@ -222,9 +222,8 @@ |
| 223 | 223 | echo htmlspecialchars( wfMsg( 'config-title', $wgVersion ) ); |
| 224 | 224 | } |
| 225 | 225 | |
| 226 | | - public function outputJQuery() { |
| 227 | | - global $wgJQueryVersion; |
| 228 | | - echo Html::linkedScript( "../skins/common/jquery-$wgJQueryVersion.min.js" ); |
| | 226 | + public function getJQuery() { |
| | 227 | + return Html::linkedScript( "../resources/jquery/jquery.js" ); |
| 229 | 228 | } |
| 230 | 229 | |
| 231 | 230 | public function outputWarnings() { |