| Index: trunk/extensions/CentralNotice/newCentralNotice.js |
| — | — | @@ -18,10 +18,8 @@ |
| 19 | 19 | }, |
| 20 | 20 | 'fn': { |
| 21 | 21 | 'loadBanner': function( bannerName ) { |
| 22 | | - // get the requested banner from /centralnotice/banners/<bannername>/<wgUserLanguage>.js |
| | 22 | + // get the requested banner |
| 23 | 23 | var bannerPage = 'Special:BannerLoader?banner='+bannerName+'&userlang='+wgContentLanguage+'&sitename='+wgNoticeProject; |
| 24 | | - //centralized version: |
| 25 | | - //var bannerURL = 'http://meta.wikimedia.org/wiki/'+bannerPage; |
| 26 | 24 | var bannerURL = wgArticlePath.replace( '$1', bannerPage ); |
| 27 | 25 | var request = $.ajax( { |
| 28 | 26 | url: bannerURL, |
| — | — | @@ -39,9 +37,7 @@ |
| 40 | 38 | // http://geoiplookup.wikimedia.org/ |
| 41 | 39 | var geoLocation = 'US'; // Hard-coding for now |
| 42 | 40 | var bannerListPage = 'Special:BannerListLoader?language='+wgContentLanguage+'&project='+wgNoticeProject+'&location='+geoLocation; |
| 43 | | - //centralized version: |
| 44 | | - //var bannerListURL = 'http://meta.wikimedia.org/wiki/'+bannerListPage; |
| 45 | | - var bannerListURL = wgArticlePath.replace( '$1', bannerListPage ); |
| | 41 | + bannerListURL = wgArticlePath.replace( '$1', bannerListPage ); |
| 46 | 42 | } |
| 47 | 43 | var request = $.ajax( { |
| 48 | 44 | url: bannerListURL, |
| Index: trunk/extensions/CentralNotice/SpecialBannerController.php |
| — | — | @@ -68,7 +68,7 @@ |
| 69 | 69 | var bannerListURL; |
| 70 | 70 | var geoLocation = Geo.country; // pull the geo info |
| 71 | 71 | var bannerListPage = 'Special:BannerListLoader?language='+wgContentLanguage+'&project='+wgNoticeProject+'&location='+geoLocation; |
| 72 | | - var bannerListURL = wgArticlePath.replace( '$1', bannerListPage ); |
| | 72 | + bannerListURL = wgArticlePath.replace( '$1', bannerListPage ); |
| 73 | 73 | var request = $.ajax( { |
| 74 | 74 | url: bannerListURL, |
| 75 | 75 | dataType: 'json', |