r38375 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r38374‎ | r38375 | r38376 >
Date:16:39, 1 August 2008
Author:brion
Status:old
Tags:
Comment:
Merge fix from trunk --

* (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...
Modified paths:
  • /branches/REL1_13/phase3/RELEASE-NOTES (modified) (history)
  • /branches/REL1_13/phase3/includes/UserMailer.php (modified) (history)

Diff [purge]

Index: branches/REL1_13/phase3/includes/UserMailer.php
@@ -314,7 +314,7 @@
315315 */
316316 function actuallyNotifyOnPageChange($editor, $title, $timestamp, $summary, $minorEdit, $oldid=false) {
317317
318 - # we use $wgEmergencyContact as sender's address
 318+ # we use $wgPasswordSender as sender's address
319319 global $wgEnotifWatchlist;
320320 global $wgEnotifMinorEdits, $wgEnotifUserTalk, $wgShowUpdatedMarker;
321321 global $wgEnotifImpersonal;
@@ -420,7 +420,7 @@
421421 * @private
422422 */
423423 function composeCommonMailtext() {
424 - global $wgEmergencyContact, $wgNoReplyAddress;
 424+ global $wgPasswordSender, $wgNoReplyAddress;
425425 global $wgEnotifFromEditor, $wgEnotifRevealEditorAddress;
426426 global $wgEnotifImpersonal;
427427
@@ -477,7 +477,7 @@
478478 # global configuration level.
479479 $editor = $this->editor;
480480 $name = $editor->getName();
481 - $adminAddress = new MailAddress( $wgEmergencyContact, 'WikiAdmin' );
 481+ $adminAddress = new MailAddress( $wgPasswordSender, 'WikiAdmin' );
482482 $editorAddress = new MailAddress( $editor );
483483 if( $wgEnotifRevealEditorAddress
484484 && ( $editor->getEmail() != '' )
Index: branches/REL1_13/phase3/RELEASE-NOTES
@@ -460,6 +460,8 @@
461461 on Sqlite instead of horribly fatal error breaky one.
462462 * (bug 14987) Only fix double redirects on page move when the checkbox is
463463 checked
 464+* (bug 13376) Use $wgPasswordSender, not $wgEmergencyContact, as return
 465+ address for page update notification mails.
464466
465467 === API changes in 1.13 ===
466468

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r38374* (bug 13376) Use $wgPasswordSender, not $wgEmergencyContact, as return...brion16:38, 1 August 2008

Status & tagging log