jenkins-bot has submitted this change and it was merged.
Change subject: Add new hook AbortTalkPageEmailNotification
......................................................................
Add new hook AbortTalkPageEmailNotification
This hook will allow extension to disable the regular talk page email
notification,
Echo is doing this with a hackish solution of setting global variable
wgEnotifUserTalk to false on the fly, this approach is problematic and will
be replaced with this hook
Change-Id: Ie043d9a1a771d64e4b05b7ddeca75c7542a6c575
---
M RELEASE-NOTES-1.22
M docs/hooks.txt
M includes/UserMailer.php
3 files changed, 11 insertions(+), 3 deletions(-)
Approvals:
Parent5446: Looks good to me, but someone else must approve
Kaldari: Looks good to me, approved
jenkins-bot: Verified
diff --git a/RELEASE-NOTES-1.22 b/RELEASE-NOTES-1.22
index 6534215..0b1d88a 100644
--- a/RELEASE-NOTES-1.22
+++ b/RELEASE-NOTES-1.22
@@ -109,6 +109,8 @@
for extensions such as OAuth:
** editmyusercss controls whether a user may edit their own CSS subpages.
** editmyuserjs controls whether a user may edit their own JS subpages.
+* Add new hook AbortTalkPageEmailNotification, this will be used to determine
+ whether to send the regular talk page email notification
=== Bug fixes in 1.22 ===
* Disable Special:PasswordReset when $wgEnableEmail is false. Previously one
diff --git a/docs/hooks.txt b/docs/hooks.txt
index 66b5068..ff0a864 100644
--- a/docs/hooks.txt
+++ b/docs/hooks.txt
@@ -270,6 +270,10 @@
$user: the User object about to be created (read-only, incomplete)
&$msg: out parameter: HTML to display on abort
+'AbortTalkPageEmailNotification': Return false to cancel talk page email
notification
+$targetUser: the user whom to send talk page email notification
+$title: the page title
+
'AbortChangePassword': Return false to cancel password change.
$user: the User object to which the password change is occuring
$mOldpass: the old password provided by the user
diff --git a/includes/UserMailer.php b/includes/UserMailer.php
index e48070a..2a549ac 100644
--- a/includes/UserMailer.php
+++ b/includes/UserMailer.php
@@ -668,11 +668,13 @@
} elseif ( $targetUser->getOption(
'enotifusertalkpages' ) &&
( !$minorEdit || $targetUser->getOption(
'enotifminoredits' ) ) )
{
- if ( $targetUser->isEmailConfirmed() ) {
+ if ( !$targetUser->isEmailConfirmed() ) {
+ wfDebug( __METHOD__ . ": talk page
owner doesn't have validated email\n" );
+ } elseif ( !wfRunHooks(
'AbortTalkPageEmailNotification', array( $targetUser, $title ) ) ) {
+ wfDebug( __METHOD__ . ": talk page
update notification is aborted for this user\n" );
+ } else {
wfDebug( __METHOD__ . ": sending talk
page update notification\n" );
return true;
- } else {
- wfDebug( __METHOD__ . ": talk page
owner doesn't have validated email\n" );
}
} else {
wfDebug( __METHOD__ . ": talk page owner
doesn't want notifications\n" );
--
To view, visit https://gerrit.wikimedia.org/r/67901
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie043d9a1a771d64e4b05b7ddeca75c7542a6c575
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bsitu <[email protected]>
Gerrit-Reviewer: Bsitu <[email protected]>
Gerrit-Reviewer: EBernhardson (WMF) <[email protected]>
Gerrit-Reviewer: Kaldari <[email protected]>
Gerrit-Reviewer: Matthias Mullie <[email protected]>
Gerrit-Reviewer: Parent5446 <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
