From: Rob Church <robchurch@users.mediawiki.org>
Date: Wed, 30 Aug 2006 13:51:37 +0000 (+0000)
Subject: * (bug 4979) Use simplified email addresses when running on Windows
X-Git-Tag: 1.31.0-rc.0~55876
X-Git-Url: http://git.cyclocoop.org///%22%40url%40//%22?a=commitdiff_plain;h=70b000f0fb70d55c3d14125b6224c85bc4908100;p=lhc%2Fweb%2Fwiklou.git

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

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 50d151c517..c74da84c37 100644
--- 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 24dab67f9d..892bf6540a 100644
--- 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 . '"';