From: Brion Vibber <brion@users.mediawiki.org>
Date: Wed, 3 Oct 2007 21:13:02 +0000 (+0000)
Subject: Fix for regression from r26357: send newtalk notifications only if user has that... 
X-Git-Tag: 1.31.0-rc.0~51224
X-Git-Url: http://git.cyclocoop.org/%22.%24redirect_annul.%22?a=commitdiff_plain;h=def1cb28451f9a8762b442c57112517dee1f2031;p=lhc%2Fweb%2Fwiklou.git

Fix for regression from r26357: send newtalk notifications only if user has that pref selected
---

diff --git a/includes/UserMailer.php b/includes/UserMailer.php
index 5a44ef29bd..cd15e3a0dd 100644
--- a/includes/UserMailer.php
+++ b/includes/UserMailer.php
@@ -348,9 +348,12 @@ class EmailNotification {
 					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" );
-				} else {
+				} elseif( $targetUser->getOption( 'enotifusertalkpages' ) ) {
+					wfDebug( __METHOD__.": sending talk page update notification\n" );
 					$this->compose( $targetUser );
 					$userTalkId = $targetUser->getId();
+				} else {
+					wfDebug( __METHOD__.": talk page owner doesn't want notifications\n" );
 				}
 			}