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

Merge "Unset user-to-user email option when user emails are disabled"

Browse source
This commit is contained in:
jenkins-bot 2021-03-12 09:29:40 +00:00 committed by Gerrit Code Review
parent 2c485950b3 2d8085bd15
commit a2933f5c8b
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
includes/EchoHooks.php
View file

@ -85,7 +85,8 @@ class EchoHooks implements RecentChange_saveHook {
public static function initEchoExtension() { public static function initEchoExtension() {
global $wgEchoNotifications, $wgEchoNotificationCategories, $wgEchoNotificationIcons, global $wgEchoNotifications, $wgEchoNotificationCategories, $wgEchoNotificationIcons,
$wgEchoMentionStatusNotifications, $wgAllowArticleReminderNotification, $wgAPIModules, $wgEchoMentionStatusNotifications, $wgAllowArticleReminderNotification, $wgAPIModules,
$wgEchoWatchlistNotifications, $wgEchoSeenTimeCacheType, $wgMainStash; $wgEchoWatchlistNotifications, $wgEchoSeenTimeCacheType, $wgMainStash, $wgEnableEmail,
$wgEnableUserEmail;
// allow extensions to define their own event // allow extensions to define their own event
Hooks::run( 'BeforeCreateEchoEvent', Hooks::run( 'BeforeCreateEchoEvent',
@ -109,6 +110,11 @@ class EchoHooks implements RecentChange_saveHook {
unset( $wgEchoNotificationCategories['minor-watchlist'] ); unset( $wgEchoNotificationCategories['minor-watchlist'] );
} }
// Only allow user email notifications when enabled
if ( !$wgEnableEmail || !$wgEnableUserEmail ) {
unset( $wgEchoNotificationCategories['emailuser'] );
}
// Default $wgEchoSeenTimeCacheType to $wgMainStash // Default $wgEchoSeenTimeCacheType to $wgMainStash
if ( $wgEchoSeenTimeCacheType === null ) { if ( $wgEchoSeenTimeCacheType === null ) {
$wgEchoSeenTimeCacheType = $wgMainStash; $wgEchoSeenTimeCacheType = $wgMainStash;