Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/287194
Change subject: Do not rely on core preferences
......................................................................
Do not rely on core preferences
Those are unreliable. Simplify code. Works fine this way as well.
Bug: T102744
Change-Id: I645b81f59c778ee4dbb27baeeaf2eaa63562441c
---
M utils/UserToggles.php
1 file changed, 6 insertions(+), 17 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/94/287194/1
diff --git a/utils/UserToggles.php b/utils/UserToggles.php
index 9755193..fff59bf 100644
--- a/utils/UserToggles.php
+++ b/utils/UserToggles.php
@@ -17,38 +17,27 @@
* Add 'translate-pref-nonewsletter' preference.
* This is most probably specific to translatewiki.net. Can be enabled
* with $wgTranslateNewsletterPreference.
- *
- * @param $user User
- * @param $preferences array
- * @return bool true
*/
- public static function onGetPreferences( $user, &$preferences ) {
+ public static function onGetPreferences( User $user, array
&$preferences ) {
global $wgTranslateNewsletterPreference;
if ( !$wgTranslateNewsletterPreference ) {
return true;
}
- global $wgEnableEmail, $wgEnotifRevealEditorAddress;
+ global $wgEnableEmail;
// Only show if email is enabled and user has a confirmed email
address.
if ( $wgEnableEmail && $user->isEmailConfirmed() ) {
// 'translate-pref-nonewsletter' is used as opt-out for
// users with a confirmed email address
- $prefs = array(
- 'translate-nonewsletter' => array(
- 'type' => 'toggle',
- 'section' => 'personal/email',
- 'label-message' =>
'translate-pref-nonewsletter'
- )
+ $preferences['translate-nonewsletter'] = array(
+ 'type' => 'toggle',
+ 'section' => 'personal/email',
+ 'label-message' => 'translate-pref-nonewsletter'
);
- // Add setting after 'enotifrevealaddr'.
- $preferences = wfArrayInsertAfter( $preferences, $prefs,
- $wgEnotifRevealEditorAddress ?
'enotifrevealaddr' : 'enotifminoredits' );
}
-
- return true;
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/287194
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I645b81f59c778ee4dbb27baeeaf2eaa63562441c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Nikerabbit <niklas.laxst...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
