jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/327487 )
Change subject: Respect $wgTwoColConflictBetaFeature setting
......................................................................
Respect $wgTwoColConflictBetaFeature setting
Bug: T153311
Change-Id: Iae239f9c36ea783fc63af0a055a948d0bb058384
---
M TwoColConflict.hooks.php
1 file changed, 6 insertions(+), 0 deletions(-)
Approvals:
Addshore: Looks good to me, approved
jenkins-bot: Verified
diff --git a/TwoColConflict.hooks.php b/TwoColConflict.hooks.php
index 2e905de..3034a0c 100644
--- a/TwoColConflict.hooks.php
+++ b/TwoColConflict.hooks.php
@@ -14,8 +14,14 @@
public static function onAlternateEdit( EditPage $editPage ) {
global $wgHooks;
+ $config = MediaWikiServices::getInstance()->getMainConfig();
+ /**
+ * If this extension is configured to be a beta feature, and
the BetaFeatures extension
+ * is loaded then require the current user to have the feature
enabled.
+ */
if (
+ $config->get( 'TwoColConflictBetaFeature' ) &&
class_exists( BetaFeatures::class ) &&
!BetaFeatures::isFeatureEnabled(
$editPage->getContext()->getUser(), 'twocolconflict' )
) {
--
To view, visit https://gerrit.wikimedia.org/r/327487
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iae239f9c36ea783fc63af0a055a948d0bb058384
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TwoColConflict
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher <tobias.gritschac...@wikimedia.de>
Gerrit-Reviewer: Addshore <addshorew...@gmail.com>
Gerrit-Reviewer: Andrew-WMDE <andrew.kos...@wikimedia.de>
Gerrit-Reviewer: WMDE-Fisch <christoph.jau...@wikimedia.de>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
