From 10a39c7e78bc5773295d9e116dba00c219cd05a2 Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Fri, 1 Aug 2008 16:38:15 +0000 Subject: [PATCH] * (bug 13376) Use $wgPasswordSender, not $wgEmergencyContact, as return address for page update notification mails. Note that $wgEmergencyContact is now not currently in active use, but could in theory be used for some kinds of failure notifications or to provide to users to contact in case of failure, which I think was its original intention. Certainly it's silly to throw an "emergency" contact on auto-sent mails! There's also a $wgNoReplyAddress, which is currently used to add a Reply-To header on notification mails. WTF? :) We should probably refactor all this address crap... --- includes/UserMailer.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/includes/UserMailer.php b/includes/UserMailer.php index 89753f2a54..0bc4268ff9 100644 --- a/includes/UserMailer.php +++ b/includes/UserMailer.php @@ -314,7 +314,7 @@ class EmailNotification { */ function actuallyNotifyOnPageChange($editor, $title, $timestamp, $summary, $minorEdit, $oldid=false) { - # we use $wgEmergencyContact as sender's address + # we use $wgPasswordSender as sender's address global $wgEnotifWatchlist; global $wgEnotifMinorEdits, $wgEnotifUserTalk, $wgShowUpdatedMarker; global $wgEnotifImpersonal; @@ -420,7 +420,7 @@ class EmailNotification { * @private */ function composeCommonMailtext() { - global $wgEmergencyContact, $wgNoReplyAddress; + global $wgPasswordSender, $wgNoReplyAddress; global $wgEnotifFromEditor, $wgEnotifRevealEditorAddress; global $wgEnotifImpersonal; @@ -477,7 +477,7 @@ class EmailNotification { # global configuration level. $editor = $this->editor; $name = $editor->getName(); - $adminAddress = new MailAddress( $wgEmergencyContact, 'WikiAdmin' ); + $adminAddress = new MailAddress( $wgPasswordSender, 'WikiAdmin' ); $editorAddress = new MailAddress( $editor ); if( $wgEnotifRevealEditorAddress && ( $editor->getEmail() != '' ) -- 2.20.1