Fixes Bug#17866

[lhc/web/wiklou.git] / includes / UserMailer.php

diff --git a/includes/UserMailer.php b/includes/UserMailer.php
index 0a7dc7f..e2fd7e9 100644 (file)
--- a/includes/UserMailer.php
+++ b/includes/UserMailer.php
@@ -55,16 +55,18 @@ class MailAddress {
                # 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() ) {
-                       global $wgEnotifUseRealName;
-                       $name = ( $wgEnotifUseRealName && $this->realName ) ? $this->realName : $this->name;
-                       $quoted = UserMailer::quotedPrintable( $name );
-                       if ( strpos( $quoted, '.' ) !== false || strpos( $quoted, ',' ) !== false ) {
-                               $quoted = '"' . $quoted . '"';
+               if ( $this->address ) {
+                       if ( $this->name != '' && !wfIsWindows() ) {
+                               global $wgEnotifUseRealName;
+                               $name = ( $wgEnotifUseRealName && $this->realName ) ? $this->realName : $this->name;
+                               $quoted = UserMailer::quotedPrintable( $name );
+                               if ( strpos( $quoted, '.' ) !== false || strpos( $quoted, ',' ) !== false ) {
+                                       $quoted = '"' . $quoted . '"';
+                               }
+                               return "$quoted <{$this->address}>";
+                       } else {
+                               return $this->address;
                        }
-                       return "$quoted <{$this->address}>";
-               } else {
-                       return $this->address;
                }
        }