TheDJ has uploaded a new change for review.
https://gerrit.wikimedia.org/r/207996
Change subject: wgNoReplyAddress: Change default to wgPasswordSender
......................................................................
wgNoReplyAddress: Change default to wgPasswordSender
Stop using a TLD that can now potentially become valid
Bug: T97711
Change-Id: If69d5f32b97320986b14260c851d4aca0d28aa69
---
M includes/DefaultSettings.php
M includes/mail/EmailNotification.php
2 files changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/96/207996/1
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 28bead7..ad7df6d 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1436,11 +1436,11 @@
$wgPasswordSenderName = 'MediaWiki Mail';
/**
- * Dummy address which should be accepted during mail send action.
- * It might be necessary to adapt the address or to set it equal
- * to the $wgEmergencyContact address.
+ * You can configure a dummy address for mail send actions
+ *
+ * Defaults to wgPasswordSender when not specified
*/
-$wgNoReplyAddress = 'reply@not.possible';
+$wgNoReplyAddress = false;
/**
* Set to true to enable the e-mail basic features:
diff --git a/includes/mail/EmailNotification.php
b/includes/mail/EmailNotification.php
index 81c4e38..73427df 100644
--- a/includes/mail/EmailNotification.php
+++ b/includes/mail/EmailNotification.php
@@ -412,7 +412,7 @@
}
} else {
$this->from = $adminAddress;
- $this->replyto = new MailAddress( $wgNoReplyAddress );
+ $this->replyto = new MailAddress( $wgNoReplyAddress ?
$wgNoReplyAddress : $wgPasswordSender );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/207996
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If69d5f32b97320986b14260c851d4aca0d28aa69
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: TheDJ <hartman.w...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
