http://www.mediawiki.org/wiki/Special:Code/MediaWiki/72998
Revision: 72998
Author: kaldari
Date: 2010-09-14 17:42:29 +0000 (Tue, 14 Sep 2010)
Log Message:
-----------
fixing incomplete var rename from r72698 (follow-up to r72997)
Modified Paths:
--------------
trunk/extensions/CentralNotice/SpecialBannerController.php
trunk/extensions/CentralNotice/newCentralNotice.js
Modified: trunk/extensions/CentralNotice/SpecialBannerController.php
===================================================================
--- trunk/extensions/CentralNotice/SpecialBannerController.php 2010-09-14
17:36:11 UTC (rev 72997)
+++ trunk/extensions/CentralNotice/SpecialBannerController.php 2010-09-14
17:42:29 UTC (rev 72998)
@@ -68,7 +68,7 @@
var bannerListURL;
var geoLocation = Geo.country; // pull the geo
info
var bannerListPage =
'Special:BannerListLoader?language='+wgContentLanguage+'&project='+wgNoticeProject+'&location='+geoLocation;
- var bannerListURL = wgArticlePath.replace(
'$1', bannerListPage );
+ bannerListURL = wgArticlePath.replace( '$1',
bannerListPage );
var request = $.ajax( {
url: bannerListURL,
dataType: 'json',
Modified: trunk/extensions/CentralNotice/newCentralNotice.js
===================================================================
--- trunk/extensions/CentralNotice/newCentralNotice.js 2010-09-14 17:36:11 UTC
(rev 72997)
+++ trunk/extensions/CentralNotice/newCentralNotice.js 2010-09-14 17:42:29 UTC
(rev 72998)
@@ -18,10 +18,8 @@
},
'fn': {
'loadBanner': function( bannerName ) {
- // get the requested banner from
/centralnotice/banners/<bannername>/<wgUserLanguage>.js
+ // get the requested banner
var bannerPage =
'Special:BannerLoader?banner='+bannerName+'&userlang='+wgContentLanguage+'&sitename='+wgNoticeProject;
- //centralized version:
- //var bannerURL =
'http://meta.wikimedia.org/wiki/'+bannerPage;
var bannerURL = wgArticlePath.replace( '$1',
bannerPage );
var request = $.ajax( {
url: bannerURL,
@@ -39,9 +37,7 @@
// http://geoiplookup.wikimedia.org/
var geoLocation = 'US'; // Hard-coding
for now
var bannerListPage =
'Special:BannerListLoader?language='+wgContentLanguage+'&project='+wgNoticeProject+'&location='+geoLocation;
- //centralized version:
- //var bannerListURL =
'http://meta.wikimedia.org/wiki/'+bannerListPage;
- var bannerListURL =
wgArticlePath.replace( '$1', bannerListPage );
+ bannerListURL = wgArticlePath.replace(
'$1', bannerListPage );
}
var request = $.ajax( {
url: bannerListURL,
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
