| Index: trunk/phase3/includes/installer/WebInstallerOutput.php |
| — | — | @@ -112,7 +112,7 @@ |
| 113 | 113 | <?php echo "var dbTypes = " . Xml::encodeJsVar( $dbTypes ) . ";\n"; ?> |
| 114 | 114 | // --> |
| 115 | 115 | </script> |
| 116 | | - <script type="text/javascript" src="../skins/common/jquery.min.js"></script> |
| | 116 | + <?php $this->outputJQuery(); ?> |
| 117 | 117 | <script type="text/javascript" src="../skins/common/config.js"></script> |
| 118 | 118 | </head> |
| 119 | 119 | |
| — | — | @@ -168,6 +168,7 @@ |
| 169 | 169 | } |
| 170 | 170 | |
| 171 | 171 | function outputShortHeader() { |
| | 172 | + |
| 172 | 173 | ?> |
| 173 | 174 | <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> |
| 174 | 175 | <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en" dir="ltr"> |
| — | — | @@ -177,7 +178,7 @@ |
| 178 | 179 | <title><?php $this->outputTitle(); ?></title> |
| 179 | 180 | <link rel="stylesheet" type="text/css" href="../skins/monobook/main.css"/> |
| 180 | 181 | <link rel="stylesheet" type="text/css" href="../skins/common/config.css"/> |
| 181 | | - <script type="text/javascript" src="../skins/common/jquery.min.js"></script> |
| | 182 | + <?php $this->outputJQuery(); ?> |
| 182 | 183 | <script type="text/javascript" src="../skins/common/config.js"></script> |
| 183 | 184 | </head> |
| 184 | 185 | |
| — | — | @@ -190,6 +191,12 @@ |
| 191 | 192 | echo htmlspecialchars( wfMsg( 'config-title', $wgVersion ) ); |
| 192 | 193 | } |
| 193 | 194 | |
| | 195 | + function outputJQuery() { |
| | 196 | + global $wgJQueryVersion; |
| | 197 | + echo '<script type="text/javascript" src="../skins/common/jquery-' . |
| | 198 | + $wgJQueryVersion . '.min.js"></script>'; |
| | 199 | + } |
| | 200 | + |
| 194 | 201 | function outputWarnings() { |
| 195 | 202 | $this->addHTML( $this->warnings ); |
| 196 | 203 | $this->warnings = ''; |