| Index: branches/REL1_13/phase3/includes/UserMailer.php |
| — | — | @@ -314,7 +314,7 @@ |
| 315 | 315 | */ |
| 316 | 316 | function actuallyNotifyOnPageChange($editor, $title, $timestamp, $summary, $minorEdit, $oldid=false) { |
| 317 | 317 | |
| 318 | | - # we use $wgEmergencyContact as sender's address |
| | 318 | + # we use $wgPasswordSender as sender's address |
| 319 | 319 | global $wgEnotifWatchlist; |
| 320 | 320 | global $wgEnotifMinorEdits, $wgEnotifUserTalk, $wgShowUpdatedMarker; |
| 321 | 321 | global $wgEnotifImpersonal; |
| — | — | @@ -420,7 +420,7 @@ |
| 421 | 421 | * @private |
| 422 | 422 | */ |
| 423 | 423 | function composeCommonMailtext() { |
| 424 | | - global $wgEmergencyContact, $wgNoReplyAddress; |
| | 424 | + global $wgPasswordSender, $wgNoReplyAddress; |
| 425 | 425 | global $wgEnotifFromEditor, $wgEnotifRevealEditorAddress; |
| 426 | 426 | global $wgEnotifImpersonal; |
| 427 | 427 | |
| — | — | @@ -477,7 +477,7 @@ |
| 478 | 478 | # global configuration level. |
| 479 | 479 | $editor = $this->editor; |
| 480 | 480 | $name = $editor->getName(); |
| 481 | | - $adminAddress = new MailAddress( $wgEmergencyContact, 'WikiAdmin' ); |
| | 481 | + $adminAddress = new MailAddress( $wgPasswordSender, 'WikiAdmin' ); |
| 482 | 482 | $editorAddress = new MailAddress( $editor ); |
| 483 | 483 | if( $wgEnotifRevealEditorAddress |
| 484 | 484 | && ( $editor->getEmail() != '' ) |
| Index: branches/REL1_13/phase3/RELEASE-NOTES |
| — | — | @@ -460,6 +460,8 @@ |
| 461 | 461 | on Sqlite instead of horribly fatal error breaky one. |
| 462 | 462 | * (bug 14987) Only fix double redirects on page move when the checkbox is |
| 463 | 463 | checked |
| | 464 | +* (bug 13376) Use $wgPasswordSender, not $wgEmergencyContact, as return |
| | 465 | + address for page update notification mails. |
| 464 | 466 | |
| 465 | 467 | === API changes in 1.13 === |
| 466 | 468 | |