jenkins-bot has submitted this change and it was merged.

Change subject: Load CentralNotice via wfLoadExtension
......................................................................


Load CentralNotice via wfLoadExtension

Bug: T140852
Change-Id: I7e65eb75a5267b168416770f854b9cca9005da94
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
M wmf-config/extension-list
3 files changed, 4 insertions(+), 8 deletions(-)

Approvals:
  Reedy: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index b7287bc..636022c 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1586,7 +1586,7 @@
 
 // Banner notice system
 if ( $wmgUseCentralNotice ) {
-       include "$IP/extensions/CentralNotice/CentralNotice.php";
+       wfLoadExtension( 'CentralNotice' );
 
        // for DNS prefetching
        $wgCentralHost = "//{$wmfHostnames['meta']}";
@@ -1608,15 +1608,11 @@
        // Allow only these domains to access CentralNotice data through the 
reporter
        $wgNoticeReporterDomains = 'https://donate.wikimedia.org';
 
-       $wgNoticeProject = $wmgNoticeProject;
-
        $wgCentralDBname = 'metawiki';
        if ( $wmfRealm == 'production' && $wgDBname == 'testwiki' ) {
                # test.wikipedia.org has its own central database:
                $wgCentralDBname = 'testwiki';
        }
-
-       $wgCentralNoticeLoader = $wmgCentralNoticeLoader;
 
        $wgNoticeInfrastructure = false;
        if ( $wgDBname == 'metawiki' ) {
diff --git a/wmf-config/InitialiseSettings.php 
b/wmf-config/InitialiseSettings.php
index 7812a4b..43df19b 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -4375,12 +4375,12 @@
        'votewiki' => false, // T61702
 ],
 
-'wmgCentralNoticeLoader' => [
+'wgCentralNoticeLoader' => [
        'default' => true, // *gulp* -- bv 2008-11-03
 ],
 
 // For CentralNotice project pickers
-'wmgNoticeProject' => [
+'wgNoticeProject' => [
        'advisorywiki' => 'wikimedia',
        'default' => '$site',
        'commonswiki' => 'commons',
diff --git a/wmf-config/extension-list b/wmf-config/extension-list
index 444f3cc..37ca054 100644
--- a/wmf-config/extension-list
+++ b/wmf-config/extension-list
@@ -10,7 +10,7 @@
 $IP/extensions/Cards/extension.json
 $IP/extensions/CategoryTree/extension.json
 $IP/extensions/CentralAuth/extension.json
-$IP/extensions/CentralNotice/CentralNotice.php
+$IP/extensions/CentralNotice/extension.json
 $IP/extensions/CharInsert/extension.json
 $IP/extensions/CheckUser/extension.json
 $IP/extensions/CirrusSearch/CirrusSearch.php

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7e65eb75a5267b168416770f854b9cca9005da94
Gerrit-PatchSet: 4
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy <re...@wikimedia.org>
Gerrit-Reviewer: AndyRussG <andrew.green...@gmail.com>
Gerrit-Reviewer: Florianschmidtwelzow <florian.schmidt.stargatewis...@gmail.com>
Gerrit-Reviewer: Reedy <re...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>

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

Reply via email to