| Index: trunk/phase3/CREDITS |
| — | — | @@ -68,6 +68,7 @@ |
| 69 | 69 | == Patch Contributors == |
| 70 | 70 | * Agbad |
| 71 | 71 | * Ahmad Sherif |
| | 72 | +* Alejandro Mery |
| 72 | 73 | * Amalthea |
| 73 | 74 | * Antonio Ospite |
| 74 | 75 | * Azliq7 |
| Index: trunk/phase3/includes/UserMailer.php |
| — | — | @@ -112,7 +112,7 @@ |
| 113 | 113 | */ |
| 114 | 114 | static function send( $to, $from, $subject, $body, $replyto=null, $contentType=null ) { |
| 115 | 115 | global $wgSMTP, $wgOutputEncoding, $wgEnotifImpersonal; |
| 116 | | - global $wgEnotifMaxRecips; |
| | 116 | + global $wgEnotifMaxRecips, $wgAdditionalMailParams; |
| 117 | 117 | |
| 118 | 118 | if ( is_array( $to ) ) { |
| 119 | 119 | // This wouldn't be necessary if implode() worked on arrays of |
| — | — | @@ -208,10 +208,10 @@ |
| 209 | 209 | |
| 210 | 210 | if (is_array($to)) { |
| 211 | 211 | foreach ($to as $recip) { |
| 212 | | - $sent = mail( $recip->toString(), wfQuotedPrintable( $subject ), $body, $headers ); |
| | 212 | + $sent = mail( $recip->toString(), wfQuotedPrintable( $subject ), $body, $headers, $wgAdditionalMailParams ); |
| 213 | 213 | } |
| 214 | 214 | } else { |
| 215 | | - $sent = mail( $to->toString(), wfQuotedPrintable( $subject ), $body, $headers ); |
| | 215 | + $sent = mail( $to->toString(), wfQuotedPrintable( $subject ), $body, $headers, $wgAdditionalMailParams ); |
| 216 | 216 | } |
| 217 | 217 | |
| 218 | 218 | restore_error_handler(); |
| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -1028,6 +1028,11 @@ |
| 1029 | 1029 | */ |
| 1030 | 1030 | $wgSMTP = false; |
| 1031 | 1031 | |
| | 1032 | +/** |
| | 1033 | + * Additional email parameters, will be passed as the last argument to mail() call. |
| | 1034 | + */ |
| | 1035 | +$wgAdditionalMailParams = null; |
| | 1036 | + |
| 1032 | 1037 | /** For email notification on page changes */ |
| 1033 | 1038 | $wgPasswordSender = $wgEmergencyContact; |
| 1034 | 1039 | |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -78,6 +78,7 @@ |
| 79 | 79 | * $wgUpgradeKey allows unlocking the web installer for upgrades without having |
| 80 | 80 | to move LocalSettings.php |
| 81 | 81 | * The FailFunction "error handling" method has now been removed |
| | 82 | +* $wgAdditionalMailParams added to allow setting extra options to mail() calls. |
| 82 | 83 | |
| 83 | 84 | === New features in 1.17 === |
| 84 | 85 | * (bug 10183) Users can now add personal styles and scripts to all skins via |