* Removed -f parameter from mail() usage, likely to cause failures and bounces.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index d5a2fa8..d448708 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -237,6 +237,7 @@ Various bugfixes, small features, and a few experimental things:
   leaves the whitespace from the section comment there on preview.
 * (bug 2274) Respect stub threshold in category page list
 * (bug 2173) Fatal error when removing an article with an empty title from the watchlist
+* Removed -f parameter from mail() usage, likely to cause failures and bounces.
 
 
 === Caveats ===

diff --git a/includes/UserMailer.php b/includes/UserMailer.php
index 7c1225c..2bb3d9a 100644 (file)
--- a/includes/UserMailer.php
+++ b/includes/UserMailer.php
@@ -93,8 +93,7 @@ function userMailer( $to, $from, $subject, $body, $replyto=false ) {
 
                $wgErrorString = '';
                set_error_handler( 'mailErrorHandler' );
-               # added -f parameter, see PHP manual for the fifth parameter when using the mail function
-               mail( $to, $subject, $body, $headers, " -f {$wgEmergencyContact}\n");
+               mail( $to, $subject, $body, $headers );
                restore_error_handler();
 
                if ( $wgErrorString ) {