[MediaWiki-commits] [Gerrit] operations/mediawiki-config[master]: Remove/collapse a few conditionals in CentralNotice config

[Reedy (Code Review)]

Reedy has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/374877 )

Change subject: Remove/collapse a few conditionals in CentralNotice config
......................................................................

Remove/collapse a few conditionals in CentralNotice config

Change-Id: I333da7c1d66a733021aedc31a534505202cb5186
---
M wmf-config/CommonSettings.php
1 file changed, 8 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config 
refs/changes/77/374877/1

diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index fa7af44..1ddf786 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1711,6 +1711,10 @@
        if ( $wgDBname === 'testwiki' ) {
                $wgCentralPagePath = "//test.wikipedia.org/w/index.php";
                $wgCentralSelectedBannerDispatcher = 
"//test.wikipedia.org/w/index.php?title=Special:BannerLoader";
+
+               // No caching for banners on testwiki, so we can develop them 
there a bit faster - NeilK 2012-01-16
+               // Never set this to zero on a highly trafficked wiki, there 
are server-melting consequences
+               $wgNoticeBannerMaxAge = 0;
        } else {
                $wgCentralPagePath = "//{$wmfHostnames['meta']}/w/index.php";
                $wgCentralSelectedBannerDispatcher = 
"//{$wmfHostnames['meta']}/w/index.php?title=Special:BannerLoader";
@@ -1722,27 +1726,17 @@
        $wgNoticeReporterDomains = 'https://donate.wikimedia.org';
 
        $wgCentralDBname = 'metawiki';
-       if ( $wmfRealm == 'production' && $wgDBname === 'testwiki' ) {
-               # test.wikipedia.org has its own central database:
-               $wgCentralDBname = 'testwiki';
-       }
-
        $wgNoticeInfrastructure = false;
-       if ( $wgDBname === 'metawiki' ) {
-               $wgNoticeInfrastructure = true;
-       }
        if ( $wmfRealm == 'production' && $wgDBname === 'testwiki' ) {
+               // test.wikipedia.org has its own central database:
+               $wgCentralDBname = 'testwiki';
+               $wgNoticeInfrastructure = true;
+       } elseif ( $wgDBname === 'metawiki' ) {
                $wgNoticeInfrastructure = true;
        }
 
        // Set fundraising banners to use HTTPS on foundation wiki
        $wgNoticeFundraisingUrl = 
'https://donate.wikimedia.org/wiki/Special:LandingCheck';
-
-       // No caching for banners on testwiki, so we can develop them there a 
bit faster - NeilK 2012-01-16
-       // Never set this to zero on a highly trafficked wiki, there are 
server-melting consequences
-       if ( $wgDBname === 'testwiki' ) {
-               $wgNoticeBannerMaxAge = 0;
-       }
 
        // Enable the CentralNotice/Translate integration
        $wgNoticeUseTranslateExtension = true;

-- 
To view, visit https://gerrit.wikimedia.org/r/374877
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I333da7c1d66a733021aedc31a534505202cb5186
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy <re...@wikimedia.org>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits