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

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index e94a9fb..a194db9 100644 (file)
--- 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 8fb300d..9962525 100644 (file)
--- 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 ) {