jenkins-bot has submitted this change and it was merged.
Change subject: Enable $wmgBug54847 for default & private, but gate also on
$wmgUseCentralAuth
......................................................................
Enable $wmgBug54847 for default & private, but gate also on $wmgUseCentralAuth
Change-Id: Ice503ff04baafd4ec8a7c900d6ad584ca196d10a
---
M wmf-config/CommonSettings.php
M wmf-config/InitialiseSettings.php
2 files changed, 3 insertions(+), 4 deletions(-)
Approvals:
Reedy: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings.php b/wmf-config/CommonSettings.php
index 3d5b7e3..0ca9b6b 100644
--- a/wmf-config/CommonSettings.php
+++ b/wmf-config/CommonSettings.php
@@ -2700,7 +2700,7 @@
}
// Bug 54847
-if ( $wmgBug54847 ) {
+if ( $wmgBug54847 && $wmgUseCentralAuth ) {
require( "$wmfConfigDir/Bug54847.php" );
}
diff --git a/wmf-config/InitialiseSettings.php
b/wmf-config/InitialiseSettings.php
index 005a554..7aea4fa 100644
--- a/wmf-config/InitialiseSettings.php
+++ b/wmf-config/InitialiseSettings.php
@@ -12739,9 +12739,8 @@
),
'wmgBug54847' => array(
- 'default' => false,
- 'testwiki' => true,
- 'test2wiki' => true,
+ 'default' => true,
+ 'private' => false,
),
);
--
To view, visit https://gerrit.wikimedia.org/r/87318
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ice503ff04baafd4ec8a7c900d6ad584ca196d10a
Gerrit-PatchSet: 2
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh <o...@wikimedia.org>
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
