| Index: branches/wmf/1.16wmf4/extensions/CentralNotice/CentralNotice.php |
| — | — | @@ -143,8 +143,8 @@ |
| 144 | 144 | function efCentralNoticeLoader( $out, $skin ) { |
| 145 | 145 | global $wgUser, $wgOut, $wgCentralDBname; |
| 146 | 146 | |
| 147 | | - $centralLoader = SpecialPage::getTitleFor( 'BannerController' )->getLocalUrl(); |
| 148 | | - |
| | 147 | + // Include '.js' to exempt script from squid cache override |
| | 148 | + $centralLoader = SpecialPage::getTitleFor( 'BannerController' )->getLocalUrl( 'cache=/cn.js' ); |
| 149 | 149 | |
| 150 | 150 | // Insert the banner controller Javascript into the <head> |
| 151 | 151 | $wgOut->addScriptFile( $centralLoader ); |
| Index: branches/wmf/1.16wmf4/extensions/CentralNotice/SpecialBannerController.php |
| — | — | @@ -68,8 +68,8 @@ |
| 69 | 69 | } else { |
| 70 | 70 | var geoLocation = Geo.country; // pull the geo info |
| 71 | 71 | } |
| 72 | | - var bannerListPage = 'Special:BannerListLoader?language='+wgContentLanguage+'&project='+wgNoticeProject+'&country='+geoLocation; |
| 73 | | - bannerListURL = wgArticlePath.replace( '$1', bannerListPage ); |
| | 72 | + var bannerListQuery = $.param( { 'language': wgContentLanguage, 'project': wgNoticeProject, 'country': geoLocation } ); |
| | 73 | + var bannerListURL = wgScript + '?title=' + wgFormattedNamespaces[-1] + ':BannerListLoader&cache=/cn.js&' + bannerListQuery; |
| 74 | 74 | var request = $.ajax( { |
| 75 | 75 | url: bannerListURL, |
| 76 | 76 | dataType: 'json', |
| Property changes on: branches/wmf/1.16wmf4/extensions/CentralNotice |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 77 | 77 | Merged /trunk/extensions/CentralNotice:r75376-75470 |