From: Anders Wegge Jakobsen <wegge@users.mediawiki.org>
Date: Sun, 22 May 2005 08:32:41 +0000 (+0000)
Subject: * (bug 2105) Add a space between -f and the from address in the mail() call.
X-Git-Tag: 1.5.0alpha2~126
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22articles%22%2C%22id_article=%24id_article%22%29%20.%20%22?a=commitdiff_plain;h=481c65ce2d4e6815bdf4092e3996e26e74de8733;p=lhc%2Fweb%2Fwiklou.git

* (bug 2105) Add a space between -f and the from address in the mail() call.
---

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 ) {