Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/175804
Change subject: Merge branch 'master' into wmf_deploy
......................................................................
Merge branch 'master' into wmf_deploy
f6c38 Fix check of banner logged-in status properties
Change-Id: Ief3714ee91674e427c03a1fd179e059b54ea7a55
---
M modules/ext.centralNotice.bannerController/bannerController.lib.js
1 file changed, 0 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralNotice
refs/changes/04/175804/1
diff --git a/modules/ext.centralNotice.bannerController/bannerController.lib.js
b/modules/ext.centralNotice.bannerController/bannerController.lib.js
index 11e04bd..dd0faf5 100644
--- a/modules/ext.centralNotice.bannerController/bannerController.lib.js
+++ b/modules/ext.centralNotice.bannerController/bannerController.lib.js
@@ -311,19 +311,10 @@
}
// Filter for logged-in status
-<<<<<<< HEAD (66cb77 Filter logged-in status on client)
- if ( mw.centralNotice.data.anonymous &&
- ( banner.display_anon != 1 ) ) {
- continue;
- }
- if ( !mw.centralNotice.data.anonymous &&
- ( banner.display_account != 1 )
) {
-=======
if ( mw.centralNotice.data.anonymous &&
!banner.display_anon ) {
continue;
}
if ( !mw.centralNotice.data.anonymous
&& !banner.display_account ) {
->>>>>>> BRANCH (3af6c3 Fix check of banner logged-in status properties)
continue;
}
--
To view, visit https://gerrit.wikimedia.org/r/175804
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ief3714ee91674e427c03a1fd179e059b54ea7a55
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralNotice
Gerrit-Branch: wmf_deploy
Gerrit-Owner: Ejegg <eeggles...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
