Adamw has submitted this change and it was merged.
Change subject: Fixing CN Banner Forcing
......................................................................
Fixing CN Banner Forcing
A nice regression bug was introduced where ?banner= forcing failed
to work. This fixes that problem. :p
Change-Id: I3f2903b3951cce5ce43e7ebd3037f35488e7d15a
---
M modules/ext.centralNotice.bannerController/bannerController.js
M special/SpecialBannerLoader.php
2 files changed, 4 insertions(+), 3 deletions(-)
Approvals:
Adamw: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ext.centralNotice.bannerController/bannerController.js
b/modules/ext.centralNotice.bannerController/bannerController.js
index 6967c1c..414ad3f 100644
--- a/modules/ext.centralNotice.bannerController/bannerController.js
+++ b/modules/ext.centralNotice.bannerController/bannerController.js
@@ -47,7 +47,7 @@
campaign: campaign,
userlang: mw.config.get( 'wgUserLanguage' ),
db: mw.config.get( 'wgDBname' ),
- sitename: mw.config.get( 'wgSiteName' ),
+ project: mw.config.get( 'wgNoticeProject' ),
country: mw.centralNotice.data.country,
device: mw.config.get( 'wgMobileDeviceName',
'desktop' )
};
diff --git a/special/SpecialBannerLoader.php b/special/SpecialBannerLoader.php
index b34d6c9..52f08fc 100644
--- a/special/SpecialBannerLoader.php
+++ b/special/SpecialBannerLoader.php
@@ -27,11 +27,12 @@
try {
$this->getParams();
-
echo $this->getJsNotice( $this->bannerName );
+ } catch ( EmptyBannerException $e ) {
+ echo "insertBanner( false );";
} catch ( BannerLoaderException $e ) {
wfDebugLog( 'CentralNotice', $e->getMessage() );
- echo "insertBanner( false );";
+ echo "insertBanner( false /* due to internal exception
*/ );";
}
}
--
To view, visit https://gerrit.wikimedia.org/r/59065
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3f2903b3951cce5ce43e7ebd3037f35488e7d15a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralNotice
Gerrit-Branch: master
Gerrit-Owner: Mwalker <mwal...@wikimedia.org>
Gerrit-Reviewer: Adamw <awi...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
