| Index: trunk/phase3/includes/UserMailer.php |
| — | — | @@ -77,9 +77,9 @@ |
| 78 | 78 | * @param $from MailAddress: sender's email |
| 79 | 79 | * @param $subject String: email's subject. |
| 80 | 80 | * @param $body String: email's text. |
| 81 | | - * @param $replyto String: optional reply-to email (default: false). |
| | 81 | + * @param $replyto String: optional reply-to email (default: null). |
| 82 | 82 | */ |
| 83 | | -function userMailer( $to, $from, $subject, $body, $replyto=false ) { |
| | 83 | +function userMailer( $to, $from, $subject, $body, $replyto=null ) { |
| 84 | 84 | global $wgUser, $wgSMTP, $wgOutputEncoding, $wgErrorString; |
| 85 | 85 | |
| 86 | 86 | if (is_array( $wgSMTP )) { |
| — | — | @@ -91,7 +91,7 @@ |
| 92 | 92 | $headers['From'] = $from->toString(); |
| 93 | 93 | $headers['To'] = $to->toString(); |
| 94 | 94 | if ( $replyto ) { |
| 95 | | - $headers['Reply-To'] = $replyto; |
| | 95 | + $headers['Reply-To'] = $replyto->toString(); |
| 96 | 96 | } |
| 97 | 97 | $headers['Subject'] = wfQuotedPrintable( $subject ); |
| 98 | 98 | $headers['Date'] = date( 'r' ); |
| — | — | @@ -140,7 +140,7 @@ |
| 141 | 141 | "X-Mailer: MediaWiki mailer$endl". |
| 142 | 142 | 'From: ' . $from->toString(); |
| 143 | 143 | if ($replyto) { |
| 144 | | - $headers .= "{$endl}Reply-To: $replyto"; |
| | 144 | + $headers .= "{$endl}Reply-To: " . $replyto->toString(); |
| 145 | 145 | } |
| 146 | 146 | |
| 147 | 147 | $dest = $to->toString(); |
| — | — | @@ -368,7 +368,7 @@ |
| 369 | 369 | } |
| 370 | 370 | } else { |
| 371 | 371 | $from = $adminAddress; |
| 372 | | - $replyto = $wgNoReplyAddress; |
| | 372 | + $replyto = new MailAddress( $wgNoReplyAddress ); |
| 373 | 373 | } |
| 374 | 374 | |
| 375 | 375 | if( $wgUser->isIP( $name ) ) { |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -170,6 +170,7 @@ |
| 171 | 171 | * (bug 8789) AJAX search: IE users can now use the return key |
| 172 | 172 | * (bug 6844) Use <ins> and <del> tags to emphase the differences |
| 173 | 173 | * (bug 6684) Fix improper javascript array iteration |
| | 174 | +* (bug 4347) use MailAddress object for reply-to |
| 174 | 175 | |
| 175 | 176 | |
| 176 | 177 | == Languages updated == |