http://www.mediawiki.org/wiki/Special:Code/MediaWiki/88441
Revision: 88441
Author: bawolff
Date: 2011-05-20 04:51:59 +0000 (Fri, 20 May 2011)
Log Message:
-----------
(bug 29055) Make don't send email on minor edits preference apply to
changes to talk page in addition to watchlist edits.
Modified Paths:
--------------
trunk/phase3/RELEASE-NOTES-1.19
trunk/phase3/includes/UserMailer.php
Modified: trunk/phase3/RELEASE-NOTES-1.19
===================================================================
--- trunk/phase3/RELEASE-NOTES-1.19 2011-05-20 00:11:37 UTC (rev 88440)
+++ trunk/phase3/RELEASE-NOTES-1.19 2011-05-20 04:51:59 UTC (rev 88441)
@@ -70,6 +70,8 @@
call callback too early.
* (bug 4330) External URLs without custom title should be treated as LTR,
also in RTL text.
+* (bug 29055) Make don't send email on minor edits preference apply to
+ changes to talk page in addition to watchlist edits.
=== API changes in 1.19 ===
* (bug 27790) add query type for querymodules to action=paraminfo
Modified: trunk/phase3/includes/UserMailer.php
===================================================================
--- trunk/phase3/includes/UserMailer.php 2011-05-20 00:11:37 UTC (rev
88440)
+++ trunk/phase3/includes/UserMailer.php 2011-05-20 04:51:59 UTC (rev
88441)
@@ -429,7 +429,9 @@
wfDebug( __METHOD__ . ": user talk page
edited, but user does not exist\n" );
} elseif ( $targetUser->getId() ==
$editor->getId() ) {
wfDebug( __METHOD__ . ": user edited
their own talk page, no notification sent\n" );
- } elseif ( $targetUser->getOption(
'enotifusertalkpages' ) ) {
+ } elseif ( $targetUser->getOption(
'enotifusertalkpages' ) &&
+ ( !$minorEdit ||
$targetUser->getOption( 'enotifminoredits' ) ) )
+ {
if ( $targetUser->isEmailConfirmed() ) {
wfDebug( __METHOD__ . ":
sending talk page update notification\n" );
$this->compose( $targetUser );
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
