(bug 29055) Make don't send email on minor edits preference apply to

changes to talk page in addition to watchlist edits.

diff --git a/RELEASE-NOTES-1.19 b/RELEASE-NOTES-1.19
index 4f165d4..9db2dfb 100644 (file)
--- 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 b33c2a6..c27997e 100644 (file)
--- 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 );