mirror of
https://gerrit.wikimedia.org/r/mediawiki/extensions/Echo
synced 2024-11-28 09:40:41 +00:00
Revert "Add echo-cross-wiki-notifications to DefaultUserOptions"
This reverts commit 617e22564f
.
Reason for revert: Disabled cross-wiki notifications for everyone.
Bug: T296270
Change-Id: Ic770b18b11d0a7280f6e205b0593d7088f5ac725
This commit is contained in:
parent
2cfe757af4
commit
1cf14cd87a
|
@ -23,7 +23,7 @@ class EchoHooks implements RecentChange_saveHook {
|
|||
* @param array &$defaults
|
||||
*/
|
||||
public static function onUserGetDefaultOptions( array &$defaults ) {
|
||||
global $wgAllowHTMLEmail, $wgEchoNotificationCategories, $wgEchoEnablePush, $wgEchoCrossWikiNotifications;
|
||||
global $wgAllowHTMLEmail, $wgEchoNotificationCategories, $wgEchoEnablePush;
|
||||
|
||||
if ( $wgAllowHTMLEmail ) {
|
||||
$defaults['echo-email-format'] = 'html'; /*EchoHooks::EMAIL_FORMAT_HTML*/
|
||||
|
@ -31,10 +31,6 @@ class EchoHooks implements RecentChange_saveHook {
|
|||
$defaults['echo-email-format'] = 'plain-text'; /*EchoHooks::EMAIL_FORMAT_PLAIN_TEXT*/
|
||||
}
|
||||
|
||||
if ( $wgEchoCrossWikiNotifications ) {
|
||||
$defaults['echo-cross-wiki-notifications'] = false;
|
||||
}
|
||||
|
||||
$presets = [
|
||||
// Set all of the events to notify by web but not email by default
|
||||
// (won't affect events that don't email)
|
||||
|
@ -89,13 +85,6 @@ class EchoHooks implements RecentChange_saveHook {
|
|||
?? $presets['default']['push'];
|
||||
}
|
||||
}
|
||||
|
||||
foreach ( self::getVirtualUserOptions() as $echoPref => $mwPref ) {
|
||||
// Use the existing core option's default for the Echo option's default
|
||||
if ( isset( $defaults[ $mwPref ] ) ) {
|
||||
$defaults[ $echoPref ] = $defaults[ $mwPref ];
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
Loading…
Reference in a new issue