Index: trunk/phase3/includes/UserMailer.php |
— | — | @@ -256,8 +256,13 @@ |
257 | 257 | ini_set( 'html_errors', '0' ); |
258 | 258 | set_error_handler( 'UserMailer::errorHandler' ); |
259 | 259 | |
| 260 | + $safeMode = wfIniGetBool( 'safe_mode' ); |
260 | 261 | foreach ( $dest as $recip ) { |
261 | | - $sent = mail( $recip, self::quotedPrintable( $subject ), $body, $headers, $wgAdditionalMailParams ); |
| 262 | + if ( $safeMode ) { |
| 263 | + $sent = mail( $recip, self::quotedPrintable( $subject ), $body, $headers ); |
| 264 | + } else { |
| 265 | + $sent = mail( $recip, self::quotedPrintable( $subject ), $body, $headers, $wgAdditionalMailParams ); |
| 266 | + } |
262 | 267 | } |
263 | 268 | |
264 | 269 | restore_error_handler(); |