Reedy has uploaded a new change for review.
https://gerrit.wikimedia.org/r/304126
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(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/26/304126/1
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 9ad11c2..142d4c6 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -1674,7 +1674,7 @@
// Banner notice system
if ( $wmgUseCentralNotice ) {
- include "$IP/extensions/CentralNotice/CentralNotice.php";
+ wfLoadExtension( 'CentralNotice' );
// for DNS prefetching
$wgCentralHost = "//{$wmfHostnames['meta']}";
@@ -1696,15 +1696,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 ffbe1ba..423b55a 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -4377,12 +4377,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 2ff54ce..f44abb7 100644
--- a/wmf-config/extension-list
+++ b/wmf-config/extension-list
@@ -10,7 +10,7 @@
$IP/extensions/Cards/extension.json
$IP/extensions/CategoryTree/CategoryTree.php
$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: newchange
Gerrit-Change-Id: I7e65eb75a5267b168416770f854b9cca9005da94
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
