From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Fri, 2 Jan 2009 21:32:00 +0000 (+0000)
Subject: (bug 16429) "nominornewtalk" should not trigger e-mail notifications
X-Git-Tag: 1.31.0-rc.0~43602
X-Git-Url: http://git.cyclocoop.org/%22.%24h.%22?a=commitdiff_plain;h=b18384211d10c30f9e40bfc39018e1824093b05a;p=lhc%2Fweb%2Fwiklou.git

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

diff --git a/includes/UserMailer.php b/includes/UserMailer.php
index 3018f4c592..731648cff9 100644
--- 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() ) {