MediaWiki r38375 - Code Review

Jump to: navigation, search
Repository:MediaWiki
Revision:< r38374‎ | r38375 (on ViewVC)‎ | 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:

Diff [purge]

Index: branches/REL1_13/phase3/includes/UserMailer.php
===================================================================
--- branches/REL1_13/phase3/includes/UserMailer.php	(revision 38374)
+++ branches/REL1_13/phase3/includes/UserMailer.php	(revision 38375)
@@ -314,7 +314,7 @@
 	 */
 	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 @@
 	 * @private
 	 */
 	function composeCommonMailtext() {
-		global $wgEmergencyContact, $wgNoReplyAddress;
+		global $wgPasswordSender, $wgNoReplyAddress;
 		global $wgEnotifFromEditor, $wgEnotifRevealEditorAddress;
 		global $wgEnotifImpersonal;
 
@@ -477,7 +477,7 @@
 		# 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() != '' )
Index: branches/REL1_13/phase3/RELEASE-NOTES
===================================================================
--- branches/REL1_13/phase3/RELEASE-NOTES	(revision 38374)
+++ branches/REL1_13/phase3/RELEASE-NOTES	(revision 38375)
@@ -460,6 +460,8 @@
   on Sqlite instead of horribly fatal error breaky one.
 * (bug 14987) Only fix double redirects on page move when the checkbox is
   checked
+* (bug 13376) Use $wgPasswordSender, not $wgEmergencyContact, as return
+  address for page update notification mails.
 
 === API changes in 1.13 ===

Status & tagging log

  • 15:29, 12 September 2011 Meno25 (Talk | contribs) changed the status of r38375 [removed: ok added: old]
Retrieved from "http://www.mediawiki.org/wiki/Special:Code/MediaWiki/38375"
Personal tools
Namespaces
Variants
Views
Actions
Site
Support
Download
Development
Communication
Toolbox