From ac81e1c69768016f9733dddf7c46614f2d879163 Mon Sep 17 00:00:00 2001
From: Max Semenik <maxsem@users.mediawiki.org>
Date: Mon, 10 Oct 2011 17:41:22 +0000
Subject: [PATCH] Unbreak sending emails using mailTargets() in safe_mode

---
 includes/UserMailer.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/includes/UserMailer.php b/includes/UserMailer.php
index d95a5c5652..649fa20a7a 100644
--- 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();
-- 
2.20.1