From 17cc63d4d9ae3316963446ff84b48780d8bcd96b Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Thu, 2 Jun 2005 03:12:54 +0000 Subject: [PATCH] * Removed -f parameter from mail() usage, likely to cause failures and bounces. --- RELEASE-NOTES | 1 + includes/UserMailer.php | 3 +-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index d5a2fa82ed..d448708b2b 100644 --- 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 7c1225c469..2bb3d9ab4d 100644 --- 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 ) { -- 2.20.1