| Index: branches/wmf/1.19wmf1/extensions/MobileFrontend/templates/ApplicationTemplate.php |
| — | — | @@ -29,11 +29,11 @@ |
| 30 | 30 | $noticeHtml = ( isset( $this->data['noticeHtml'] ) ) ? $this->data['noticeHtml'] : ''; |
| 31 | 31 | |
| 32 | 32 | $startScriptTag = '<script type="text/javascript" src="'; |
| 33 | | - $endScriptTag = '"></script>'; |
| | 33 | + $endScriptTag = "?version={$wgMobileResourceVersion}\"></script>"; |
| 34 | 34 | $javaScriptPath = $this->data['wgExtensionAssetsPath'] . '/MobileFrontend/javascripts/'; |
| 35 | 35 | |
| 36 | 36 | $jQuerySupport = $this->data['device']['supports_jquery']; |
| 37 | | - $jQueryScript = $jQuerySupport ? $startScriptTag . $javaScriptPath . 'jquery-1.7.2.min.js' . $endScriptTag : ''; |
| | 37 | + $jQueryScript = $jQuerySupport ? "{$startScriptTag}{$javaScriptPath}jquery-1.7.2.min.js{$endScriptTag}" : ''; |
| 38 | 38 | $filePageScript = ( $this->data['isFilePage'] ) ? $startScriptTag . $javaScriptPath . 'filepage.js?version=' . $wgMobileResourceVersion . $endScriptTag : ''; |
| 39 | 39 | |
| 40 | 40 | $robots = isset( $this->data['robots'] ) ? "\n {$this->data['robots']}" : ''; |
| — | — | @@ -64,7 +64,7 @@ |
| 65 | 65 | |
| 66 | 66 | if( $this->data['isBetaGroupMember'] && $jQuerySupport ) { |
| 67 | 67 | $betajs = <<<HTML |
| 68 | | - {$startScriptTag}{$javaScriptPath}references.{$resourceSuffix}js?version={$wgMobileResourceVersion}{$endScriptTag} |
| | 68 | + {$startScriptTag}{$javaScriptPath}references.{$resourceSuffix}js{$endScriptTag} |
| 69 | 69 | HTML; |
| 70 | 70 | } else { |
| 71 | 71 | $betajs = ""; |
| — | — | @@ -95,10 +95,10 @@ |
| 96 | 96 | </div> |
| 97 | 97 | {$this->data['footerHtml']} |
| 98 | 98 | <!--[if gt IE 9]><!--> |
| 99 | | - {$startScriptTag}{$javaScriptPath}application.{$resourceSuffix}js?version={$wgMobileResourceVersion}{$endScriptTag} |
| 100 | | - {$startScriptTag}{$javaScriptPath}toggle.{$resourceSuffix}js?version={$wgMobileResourceVersion}{$endScriptTag} |
| 101 | | - {$startScriptTag}{$javaScriptPath}banner.{$resourceSuffix}js?version={$wgMobileResourceVersion}{$endScriptTag} |
| 102 | | - {$startScriptTag}{$javaScriptPath}{$betaPrefix}opensearch.{$resourceSuffix}js?version={$wgMobileResourceVersion}{$endScriptTag} |
| | 99 | + {$startScriptTag}{$javaScriptPath}application.{$resourceSuffix}js{$endScriptTag} |
| | 100 | + {$startScriptTag}{$javaScriptPath}toggle.{$resourceSuffix}js{$endScriptTag} |
| | 101 | + {$startScriptTag}{$javaScriptPath}banner.{$resourceSuffix}js{$endScriptTag} |
| | 102 | + {$startScriptTag}{$javaScriptPath}{$betaPrefix}opensearch.{$resourceSuffix}js{$endScriptTag} |
| 103 | 103 | {$betajs} |
| 104 | 104 | {$filePageScript} |
| 105 | 105 | <!--[endif]--> |