* (bug 4979) Use simplified email addresses when running on Windows

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 50d151c..c74da84 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -165,7 +165,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 7059) Introduce "anchorencode" colon function
 * Include SVN revision number in {{CURRENTVERSION}} output, where applicable
 * Fix bug in wfRunHooks which caused corruption of objects in the hook list
-
+* (bug 4979) Use simplified email addresses when running on Windows
 
 == Languages updated ==
 

diff --git a/includes/UserMailer.php b/includes/UserMailer.php
index 24dab67..892bf65 100644 (file)
--- a/includes/UserMailer.php
+++ b/includes/UserMailer.php
@@ -53,7 +53,10 @@ class MailAddress {
         * @return string
         */
        function toString() {
-               if( $this->name != '' ) {
+               # PHP's mail() implementation under Windows is somewhat shite, and
+               # can't handle "Joe Bloggs <joe@bloggs.com>" format email addresses,
+               # so don't bother generating them
+               if( $this->name != '' && !wfIsWindows() ) {
                        $quoted = wfQuotedPrintable( $this->name );
                        if( strpos( $quoted, '.' ) !== false ) {
                                $quoted = '"' . $quoted . '"';