From: Matthew Flaschen <mflaschen@wikimedia.org>
Date: Thu, 9 Jul 2015 00:29:39 +0000 (-0400)
Subject: Fix inaccurate documentation re $wgEnotifMinorEdits
X-Git-Tag: 1.31.0-rc.0~10843^2
X-Git-Url: https://git.cyclocoop.org/%27.WWW_URL.%27admin/?a=commitdiff_plain;h=40761e9ee70eaddd2285e7311919344141f8a8fe;p=lhc%2Fweb%2Fwiklou.git

Fix inaccurate documentation re $wgEnotifMinorEdits

In actuallyNotifyOnPageChange, the $wgEnotifUserTalk is inside
a check involving $wgEnotifMinorEdits, so it won't fire if
it's a minor edit and $wgEnotifMinorEdits is false.

Change-Id: I6576cb1735db5d9288257e6877b8755450d0dacd
---

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index f233ad71b6..813d11df10 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1597,7 +1597,8 @@ $wgEnotifRevealEditorAddress = false;
 
 /**
  * Send notification mails on minor edits to watchlist pages. This is enabled
- * by default. Does not affect user talk notifications.
+ * by default. User talk notifications are affected by this, $wgEnotifUserTalk, and
+ * the nominornewtalk user right.
  */
 $wgEnotifMinorEdits = true;
 
diff --git a/includes/mail/EmailNotification.php b/includes/mail/EmailNotification.php
index c359659fdd..1027732867 100644
--- a/includes/mail/EmailNotification.php
+++ b/includes/mail/EmailNotification.php
@@ -135,7 +135,9 @@ class EmailNotification {
 
 		$sendEmail = true;
 		// If nobody is watching the page, and there are no users notified on all changes
-		// don't bother creating a job/trying to send emails
+		// don't bother creating a job/trying to send emails, unless it's a
+		// talk page with an applicable notification.
+		//
 		// $watchers deals with $wgEnotifWatchlist
 		if ( !count( $watchers ) && !count( $wgUsersNotifiedOnAllChanges ) ) {
 			$sendEmail = false;