Merge "Actually make $wgNoReplyAddress default to $wgPasswordSender"

diff --combined includes/Setup.php
index 2585738,2ab1447..f7d8d08
--- 1/includes/Setup.php
--- 2/includes/Setup.php
+++ b/includes/Setup.php
@@@ -443,6 -443,15 +443,6 @@@ $wgHtml5 = true
  $wgXhtmlDefaultNamespace = 'http://www.w3.org/1999/xhtml';
  $wgJsMimeType = 'text/javascript';
  
 -if ( !$wgHtml5Version && $wgAllowRdfaAttributes ) {
 -      // see http://www.w3.org/TR/rdfa-in-html/#document-conformance
 -      if ( $wgMimeType == 'application/xhtml+xml' ) {
 -              $wgHtml5Version = 'XHTML+RDFa 1.0';
 -      } else {
 -              $wgHtml5Version = 'HTML+RDFa 1.0';
 -      }
 -}
 -
  // Blacklisted file extensions shouldn't appear on the "allowed" list
  $wgFileExtensions = array_values( array_diff( $wgFileExtensions, $wgFileBlacklist ) );
  
@@@ -601,7 -610,7 +601,7 @@@ if ( !$wgPasswordSender ) 
        $wgPasswordSender = 'apache@' . $wgServerName;
  }
  if ( !$wgNoReplyAddress ) {
-       $wgNoReplyAddress = $wgNoReplyAddress;
+       $wgNoReplyAddress = $wgPasswordSender;
  }
  
  if ( $wgSecureLogin && substr( $wgServer, 0, 2 ) !== '//' ) {