| Index: trunk/phase3/includes/Setup.php |
| — | — | @@ -447,6 +447,12 @@ |
| 448 | 448 | |
| 449 | 449 | $wgDeferredUpdateList = array(); |
| 450 | 450 | |
| | 451 | +// We need to check for safe_mode, because mail() willl throws an E_NOTICE |
| | 452 | +// on additional parameters |
| | 453 | +if( !is_null($wgAdditionalMailParams) && wgIniGetBool('safe_mode') ) { |
| | 454 | + $wgAdditionalMailParams = null; |
| | 455 | +} |
| | 456 | + |
| 451 | 457 | wfProfileOut( $fname . '-globals' ); |
| 452 | 458 | wfProfileIn( $fname . '-extensions' ); |
| 453 | 459 | |
| Index: trunk/phase3/includes/UserMailer.php |
| — | — | @@ -221,19 +221,11 @@ |
| 222 | 222 | ini_set( 'html_errors', '0' ); |
| 223 | 223 | set_error_handler( array( 'UserMailer', 'errorHandler' ) ); |
| 224 | 224 | |
| 225 | | - // We need to check for safe_mode, because mail() throws an E_NOTICE |
| 226 | | - // on the 5th parameter when it's turned on |
| 227 | | - $sm = wfIniGetBool( 'safe_mode' ); |
| 228 | | - |
| 229 | 225 | if ( !is_array( $to ) ) { |
| 230 | 226 | $to = array( $to ); |
| 231 | 227 | } |
| 232 | 228 | foreach ( $to as $recip ) { |
| 233 | | - if( $sm ) { |
| 234 | | - $sent = mail( $recip->toString(), self::quotedPrintable( $subject ), $body, $headers ); |
| 235 | | - } else { |
| 236 | | - $sent = mail( $recip->toString(), self::quotedPrintable( $subject ), $body, $headers, $wgAdditionalMailParams ); |
| 237 | | - } |
| | 229 | + $sent = mail( $recip->toString(), self::quotedPrintable( $subject ), $body, $headers, $wgAdditionalMailParams ); |
| 238 | 230 | } |
| 239 | 231 | |
| 240 | 232 | restore_error_handler(); |