Tobias Gritschacher has uploaded a new change for review. ( 
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(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TwoColConflict 
refs/changes/87/327487/1

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: newchange
Gerrit-Change-Id: Iae239f9c36ea783fc63af0a055a948d0bb058384
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TwoColConflict
Gerrit-Branch: master
Gerrit-Owner: Tobias Gritschacher <tobias.gritschac...@wikimedia.de>

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

Reply via email to