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

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 6641c0f..085adcc 100644 (file)
--- 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 19a4728..389b630 100644 (file)
--- 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}>";