From 3676997f0247fc709b63fe827ed8aa9cb835c1d2 Mon Sep 17 00:00:00 2001 From: Brian Wolff Date: Fri, 20 May 2011 04:51:59 +0000 Subject: [PATCH] (bug 29055) Make don't send email on minor edits preference apply to changes to talk page in addition to watchlist edits. --- RELEASE-NOTES-1.19 | 2 ++ includes/UserMailer.php | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/RELEASE-NOTES-1.19 b/RELEASE-NOTES-1.19 index 4f165d4c02..9db2dfb323 100644 --- a/RELEASE-NOTES-1.19 +++ b/RELEASE-NOTES-1.19 @@ -70,6 +70,8 @@ production. call callback too early. * (bug 4330) External URLs without custom title should be treated as LTR, also in RTL text. +* (bug 29055) Make don't send email on minor edits preference apply to + changes to talk page in addition to watchlist edits. === API changes in 1.19 === * (bug 27790) add query type for querymodules to action=paraminfo diff --git a/includes/UserMailer.php b/includes/UserMailer.php index b33c2a6c23..c27997e06e 100644 --- a/includes/UserMailer.php +++ b/includes/UserMailer.php @@ -429,7 +429,9 @@ class EmailNotification { wfDebug( __METHOD__ . ": user talk page edited, but user does not exist\n" ); } elseif ( $targetUser->getId() == $editor->getId() ) { wfDebug( __METHOD__ . ": user edited their own talk page, no notification sent\n" ); - } elseif ( $targetUser->getOption( 'enotifusertalkpages' ) ) { + } elseif ( $targetUser->getOption( 'enotifusertalkpages' ) && + ( !$minorEdit || $targetUser->getOption( 'enotifminoredits' ) ) ) + { if ( $targetUser->isEmailConfirmed() ) { wfDebug( __METHOD__ . ": sending talk page update notification\n" ); $this->compose( $targetUser ); -- 2.20.1