From 26f0ac13ea9a79dfdf5bb2a9cce6276b585134c2 Mon Sep 17 00:00:00 2001
From: Reedy <reedy@wikimedia.org>
Date: Fri, 18 Mar 2016 14:19:07 +0000
Subject: [PATCH] Actually make $wgNoReplyAddress default to $wgPasswordSender

Bug: T130368
Change-Id: Ifc32f0cf82ea80361822f612b0c6aeb427721606
---
 includes/Setup.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/Setup.php b/includes/Setup.php
index f26d789496..2ab1447e77 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -610,7 +610,7 @@ if ( !$wgPasswordSender ) {
 	$wgPasswordSender = 'apache@' . $wgServerName;
 }
 if ( !$wgNoReplyAddress ) {
-	$wgNoReplyAddress = $wgNoReplyAddress;
+	$wgNoReplyAddress = $wgPasswordSender;
 }
 
 if ( $wgSecureLogin && substr( $wgServer, 0, 2 ) !== '//' ) {
-- 
2.20.1