From 40761e9ee70eaddd2285e7311919344141f8a8fe Mon Sep 17 00:00:00 2001 From: Matthew Flaschen Date: Wed, 8 Jul 2015 20:29:39 -0400 Subject: [PATCH] Fix inaccurate documentation re $wgEnotifMinorEdits In actuallyNotifyOnPageChange, the $wgEnotifUserTalk is inside a check involving $wgEnotifMinorEdits, so it won't fire if it's a minor edit and $wgEnotifMinorEdits is false. Change-Id: I6576cb1735db5d9288257e6877b8755450d0dacd --- includes/DefaultSettings.php | 3 ++- includes/mail/EmailNotification.php | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index f233ad71b6..813d11df10 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -1597,7 +1597,8 @@ $wgEnotifRevealEditorAddress = false; /** * Send notification mails on minor edits to watchlist pages. This is enabled - * by default. Does not affect user talk notifications. + * by default. User talk notifications are affected by this, $wgEnotifUserTalk, and + * the nominornewtalk user right. */ $wgEnotifMinorEdits = true; diff --git a/includes/mail/EmailNotification.php b/includes/mail/EmailNotification.php index c359659fdd..1027732867 100644 --- a/includes/mail/EmailNotification.php +++ b/includes/mail/EmailNotification.php @@ -135,7 +135,9 @@ class EmailNotification { $sendEmail = true; // If nobody is watching the page, and there are no users notified on all changes - // don't bother creating a job/trying to send emails + // don't bother creating a job/trying to send emails, unless it's a + // talk page with an applicable notification. + // // $watchers deals with $wgEnotifWatchlist if ( !count( $watchers ) && !count( $wgUsersNotifiedOnAllChanges ) ) { $sendEmail = false; -- 2.20.1