* (bug 7010) Don't send email notifications for watched talk pages when user

  has selected to receive only updates for their own talk page

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 43d9ce7..0577d85 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -137,6 +137,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 3512) namespaceDupes now handles spaces and initial caps properly
 * (bug 7037) Fix regression in login tab order
 * (bug 7031) Report missing email on 'email password' instead of false success
+* (bug 7010) Don't send email notifications for watched talk pages when user
+  has selected to receive only updates for their own talk page
 
 
 == Languages updated ==

diff --git a/includes/UserMailer.php b/includes/UserMailer.php
index 2cfa188..24dab67 100644 (file)
--- a/includes/UserMailer.php
+++ b/includes/UserMailer.php
@@ -258,8 +258,11 @@ class EmailNotification {
 
                                                $wuser = $dbr->fetchObject( $res );
                                                $watchingUser->setID($wuser->wl_user);
+                                               
                                                if ( ( $enotifwatchlistpage && $watchingUser->getOption('enotifwatchlistpages') ) ||
-                                                       ( $enotifusertalkpage && $watchingUser->getOption('enotifusertalkpages') )
+                                                       ( $enotifusertalkpage
+                                                               && $watchingUser->getOption('enotifusertalkpages')
+                                                               && $title->equals( $watchingUser->getTalkPage() ) )
                                                && (!$minorEdit || ($wgEnotifMinorEdits && $watchingUser->getOption('enotifminoredits') ) )
                                                && ($watchingUser->isEmailConfirmed() ) ) {
                                                        # ... adjust remaining text and page edit time placeholders