From 481c65ce2d4e6815bdf4092e3996e26e74de8733 Mon Sep 17 00:00:00 2001 From: Anders Wegge Jakobsen Date: Sun, 22 May 2005 08:32:41 +0000 Subject: [PATCH] * (bug 2105) Add a space between -f and the from address in the mail() call. --- RELEASE-NOTES | 1 + includes/UserMailer.php | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index e94a9fb197..a194db9475 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -161,6 +161,7 @@ Various bugfixes, small features, and a few experimental things: (used to just be able to take paramaters via a GET request like index.php?title=Special:Movepage&target=Page_to_move) * Deprecated the {{msg:template}} syntax for referring to templates * (bug 2151) The delete summary now includes editor name, if only one has edited the article. +* (bug 2105) Fixed from argument to the PHP mail() function. A missing space could prevent sending mail with some versions of sendmail. * ...and more! diff --git a/includes/UserMailer.php b/includes/UserMailer.php index 8fb300d73c..996252573a 100644 --- a/includes/UserMailer.php +++ b/includes/UserMailer.php @@ -94,7 +94,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, " -f {$wgEmergencyContact}\n"); restore_error_handler(); if ( $wgErrorString ) { -- 2.20.1