dépôts / lhc / web / wiklou.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1f7d328)
Fix jQuery support since we now version it
authorChad Horohoe <demon@users.mediawiki.org>
Fri, 7 May 2010 13:28:29 +0000 (13:28 +0000)
committerChad Horohoe <demon@users.mediawiki.org>
Fri, 7 May 2010 13:28:29 +0000 (13:28 +0000)
includes/installer/WebInstallerOutput.php patch | blob | history

diff --git a/includes/installer/WebInstallerOutput.php b/includes/installer/WebInstallerOutput.php
index 1b88a74..9d0c6b1 100644 (file)
--- a/includes/installer/WebInstallerOutput.php
+++ b/includes/installer/WebInstallerOutput.php
@@ -112,7 +112,7 @@ class WebInstallerOutput {
 <?php echo "var dbTypes = " . Xml::encodeJsVar( $dbTypes ) . ";\n"; ?>
        // -->
        </script>
-       <script type="text/javascript" src="../skins/common/jquery.min.js"></script>
+       <?php $this->outputJQuery(); ?>
        <script type="text/javascript" src="../skins/common/config.js"></script>
 </head>
 
@@ -168,6 +168,7 @@ class WebInstallerOutput {
        }
 
        function outputShortHeader() {
+               
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr">
@@ -177,7 +178,7 @@ class WebInstallerOutput {
        <title><?php $this->outputTitle(); ?></title>
        <link rel="stylesheet" type="text/css" href="../skins/monobook/main.css"/>
        <link rel="stylesheet" type="text/css" href="../skins/common/config.css"/>
-       <script type="text/javascript" src="../skins/common/jquery.min.js"></script>
+       <?php $this->outputJQuery(); ?>
        <script type="text/javascript" src="../skins/common/config.js"></script>
 </head>
 
@@ -190,6 +191,12 @@ class WebInstallerOutput {
                echo htmlspecialchars( wfMsg( 'config-title', $wgVersion ) );
        }
 
+       function outputJQuery() {
+               global $wgJQueryVersion;
+               echo '<script type="text/javascript" src="../skins/common/jquery-' .
+                       $wgJQueryVersion . '.min.js"></script>';
+       }
+
        function outputWarnings() {
                $this->addHTML( $this->warnings );
                $this->warnings = '';
Wiklou, le Wiki du Wiklou