Merge "Actually make $wgNoReplyAddress default to $wgPasswordSender"

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