Actually make $wgNoReplyAddress default to $wgPasswordSender
authorReedy <reedy@wikimedia.org>
Fri, 18 Mar 2016 14:19:07 +0000 (14:19 +0000)
committerReedy <reedy@wikimedia.org>
Fri, 18 Mar 2016 14:19:07 +0000 (14:19 +0000)
Bug: T130368
Change-Id: Ifc32f0cf82ea80361822f612b0c6aeb427721606

includes/Setup.php

index f26d789..2ab1447 100644 (file)
@@ -610,7 +610,7 @@ if ( !$wgPasswordSender ) {
        $wgPasswordSender = 'apache@' . $wgServerName;
 }
 if ( !$wgNoReplyAddress ) {
-       $wgNoReplyAddress = $wgNoReplyAddress;
+       $wgNoReplyAddress = $wgPasswordSender;
 }
 
 if ( $wgSecureLogin && substr( $wgServer, 0, 2 ) !== '//' ) {