From f7d4f86c7b27e9602da92e9471d4b3a8e658de1e Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Fri, 18 Aug 2006 01:43:33 +0000 Subject: [PATCH] * (bug 7010) Don't send email notifications for watched talk pages when user has selected to receive only updates for their own talk page --- RELEASE-NOTES | 2 ++ includes/UserMailer.php | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 43d9ce76b2..0577d85366 100644 --- 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 2cfa188821..24dab67f9d 100644 --- 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 -- 2.20.1