wikimedia/mediawiki-extensions-Echo
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Echo synced 2024-11-23 23:44:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Replace deprecated UserSaveOptions hook"

Browse source
This commit is contained in:
jenkins-bot 2021-08-03 14:20:36 +00:00 committed by Gerrit Code Review
parent 822e623b7d 113230aaed
commit d9f43ee2f0
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
extension.json
View file

@ -474,7 +474,7 @@
"ResourceLoaderRegisterModules": "EchoHooks::onResourceLoaderRegisterModules",
"UserGroupsChanged": "EchoHooks::onUserGroupsChanged",
"UserLoadOptions": "EchoHooks::onUserLoadOptions",
"UserSaveOptions": "EchoHooks::onUserSaveOptions",
"SaveUserOptions": "EchoHooks::onSaveUserOptions",
"UserGetDefaultOptions": "EchoHooks::onUserGetDefaultOptions",
"UserClearNewTalkNotification": "EchoHooks::onUserClearNewTalkNotification",
"EmailUserComplete": "EchoHooks::onEmailUserComplete",

18
includes/EchoHooks.php
View file

@ -342,7 +342,7 @@ class EchoHooks implements RecentChange_saveHook {
// Show subscription options. IMPORTANT: 'echo-subscriptions-email-edit-user-talk',
// 'echo-subscriptions-email-watchlist', and 'echo-subscriptions-email-minor-watchlist' are
// virtual options, their values are saved to existing notification options 'enotifusertalkpages',
// 'enotifwatchlistpages', and 'enotifminoredits', see onUserLoadOptions() and onUserSaveOptions()
// 'enotifwatchlistpages', and 'enotifminoredits', see onUserLoadOptions() and onSaveUserOptions()
// for more information on how it is handled. Doing it in this way, we can avoid keeping running
// massive data migration script to keep these two options synced when echo is enabled on
// new wikis or Echo is disabled and re-enabled for some reason. We can update the name
@ -1324,17 +1324,17 @@ class EchoHooks implements RecentChange_saveHook {
}
/**
* Handler for UserSaveOptions hook.
* @see https://www.mediawiki.org/wiki/Manual:Hooks/UserSaveOptions
* @param User $user User whose options are being saved
* @param array &$options Options can be modified
* Handler for SaveUserOptions hook.
* @see https://www.mediawiki.org/wiki/Manual:Hooks/SaveUserOptions
* @param UserIdentity $user User whose options are being saved
* @param array &$modifiedOptions Options can be modified
*/
public static function onUserSaveOptions( $user, &$options ) {
public static function onSaveUserOptions( UserIdentity $user, array &$modifiedOptions ) {
foreach ( self::getVirtualUserOptions() as $echoPref => $mwPref ) {
// Save virtual option values in corresponding real option values
if ( isset( $options[ $echoPref ] ) ) {
$options[ $mwPref ] = $options[ $echoPref ];
unset( $options[ $echoPref ] );
if ( isset( $modifiedOptions[ $echoPref ] ) ) {
$modifiedOptions[ $mwPref ] = $modifiedOptions[ $echoPref ];
unset( $modifiedOptions[ $echoPref ] );
}
}
}