jenkins-bot has submitted this change and it was merged.
Change subject: Remove preference prefix string
......................................................................
Remove preference prefix string
Preferences should belong to the extensions they control as
they don't necessarily want to be dependent on the BetaFeatures
extensions to control them.
Change-Id: Id510b2e874920ea222f7717accca2c5956a4e9c3
---
M BetaFeaturesHooks.php
1 file changed, 4 insertions(+), 6 deletions(-)
Approvals:
MarkTraceur: Looks good to me, approved
jenkins-bot: Verified
diff --git a/BetaFeaturesHooks.php b/BetaFeaturesHooks.php
index e7b59c9..c542ef6 100644
--- a/BetaFeaturesHooks.php
+++ b/BetaFeaturesHooks.php
@@ -62,17 +62,15 @@
}
if ( $complete ) {
- $prefname = 'beta-feature-' . $key;
+ $prefs[$key] = $opt;
- $prefs[$prefname] = $opt;
-
- $currentValue = $user->getOption( $prefname );
+ $currentValue = $user->getOption( $key );
if ( $currentValue !==
HTMLFeatureField::OPTION_ENABLED &&
$currentValue !==
HTMLFeatureField::OPTION_DISABLED &&
$user->getOption(
'beta-feature-auto-enroll' ) === HTMLFeatureField::OPTION_ENABLED ) {
// We haven't seen this before, and the
user has auto-enroll enabled!
// Set the option to true.
- $user->setOption( $prefname,
HTMLFeatureField::OPTION_ENABLED );
+ $user->setOption( $key,
HTMLFeatureField::OPTION_ENABLED );
}
}
}
@@ -83,7 +81,7 @@
static function getAutoEnrollPreference( $user, &$prefs ) {
global $wgExtensionAssetsPath;
- $prefs['auto-enroll'] = array(
+ $prefs['beta-feature-auto-enroll'] = array(
'label-message' => 'betafeatures-auto-enroll',
'desc-message' => 'betafeatures-auto-enroll-desc',
'info-link' =>
'https://mediawiki.org/wiki/Extension:BetaFeatures/Auto-enrollment',
--
To view, visit https://gerrit.wikimedia.org/r/81528
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id510b2e874920ea222f7717accca2c5956a4e9c3
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/BetaFeatures
Gerrit-Branch: master
Gerrit-Owner: Esanders <[email protected]>
Gerrit-Reviewer: Esanders <[email protected]>
Gerrit-Reviewer: MarkTraceur <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
