From: Brion Vibber <brion@users.mediawiki.org>
Date: Tue, 22 Jan 2008 03:52:14 +0000 (+0000)
Subject: * (bug 12327) Comma in username no longer disrupts mail headers
X-Git-Tag: 1.31.0-rc.0~49853
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/password.php?a=commitdiff_plain;h=345c9c948e1665e9c58eae209bcf08447132b2a0;p=lhc%2Fweb%2Fwiklou.git

* (bug 12327) Comma in username no longer disrupts mail headers
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 6641c0fcb0..085adcc036 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -330,6 +330,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 11593, 12719) Fixes for overzealous invocation of thumb.php.
   Non-image handlers and full-size images may now decline it, fixing
   mystery failures when using $wgThumbnailScriptPath.
+* (bug 12327) Comma in username no longer disrupts mail headers
 
 
 == Parser changes in 1.12 ==
diff --git a/includes/UserMailer.php b/includes/UserMailer.php
index 19a47280a8..389b6301e1 100644
--- a/includes/UserMailer.php
+++ b/includes/UserMailer.php
@@ -52,7 +52,7 @@ class MailAddress {
 		# so don't bother generating them
 		if( $this->name != '' && !wfIsWindows() ) {
 			$quoted = wfQuotedPrintable( $this->name );
-			if( strpos( $quoted, '.' ) !== false ) {
+			if( strpos( $quoted, '.' ) !== false || strpos( $quoted, ',' ) !== false ) {
 				$quoted = '"' . $quoted . '"';
 			}
 			return "$quoted <{$this->address}>";