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 ===
