(bug 16429) "nominornewtalk" should not trigger e-mail notifications

diff --git a/includes/UserMailer.php b/includes/UserMailer.php
index 3018f4c..731648c 100644 (file)
--- a/includes/UserMailer.php
+++ b/includes/UserMailer.php
@@ -342,7 +342,7 @@ class EmailNotification {
 
                $userTalkId = false;
 
-               if ( (!$minorEdit || $wgEnotifMinorEdits) ) {
+               if ( !$minorEdit || ($wgEnotifMinorEdits && !$editor->isAllowed('nominornewtalk') ) ) {
                        if ( $wgEnotifUserTalk && $isUserTalkPage ) {
                                $targetUser = User::newFromName( $title->getText() );
                                if ( !$targetUser || $targetUser->isAnon() ) {