| Index: branches/wmf-deployment/includes/OutputPage.php |
| — | — | @@ -2218,7 +2218,7 @@ |
| 2219 | 2219 | |
| 2220 | 2220 | $params = array( |
| 2221 | 2221 | 'type' => $wgJsMimeType, |
| 2222 | | - 'src' => "$wgStylePath/jquery.min.js?$wgStyleVersion", |
| | 2222 | + 'src' => "$wgStylePath/common/jquery.min.js?$wgStyleVersion", |
| 2223 | 2223 | ); |
| 2224 | 2224 | if ( !$this->mJQueryDone ) { |
| 2225 | 2225 | $this->mJQueryDone = true; |
| Property changes on: branches/wmf-deployment/includes/OutputPage.php |
| ___________________________________________________________________ |
| Name: svn:mergeinfo |
| 2226 | 2226 | - /branches/REL1_15/phase3/includes/OutputPage.php:51646 |
| /branches/wmf-deployment/includes/OutputPage.php:53381 |
| /trunk/phase3/includes/OutputPage.php:56213,56215-56216,56218,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57472,57530,57541,57602,57916,58151,58219,58633,58816,60704,61431,61557,61568,61836,61838 |
| 2227 | 2227 | + /branches/REL1_15/phase3/includes/OutputPage.php:51646 |
| /branches/wmf-deployment/includes/OutputPage.php:53381 |
| /trunk/phase3/includes/OutputPage.php:56213,56215-56216,56218,56334-56336,56338,56340,56343,56345,56347,56350,57154-57447,57472,57530,57541,57602,57916,58151,58219,58633,58816,60704,61431,61557,61568,61836,61838,61840 |