Unbreak sending emails using mailTargets() in safe_mode

diff --git a/includes/UserMailer.php b/includes/UserMailer.php
index d95a5c5..649fa20 100644 (file)
--- a/includes/UserMailer.php
+++ b/includes/UserMailer.php
@@ -256,8 +256,13 @@ class UserMailer {
                        ini_set( 'html_errors', '0' );
                        set_error_handler( 'UserMailer::errorHandler' );
 
+                       $safeMode = wfIniGetBool( 'safe_mode' );
                        foreach ( $dest as $recip ) {
-                               $sent = mail( $recip, self::quotedPrintable( $subject ), $body, $headers, $wgAdditionalMailParams );
+                               if ( $safeMode ) {
+                                       $sent = mail( $recip, self::quotedPrintable( $subject ), $body, $headers );
+                               } else {
+                                       $sent = mail( $recip, self::quotedPrintable( $subject ), $body, $headers, $wgAdditionalMailParams );
+                               }
                        }
 
                        restore_error_handler();