From: Max Semenik <maxsem@users.mediawiki.org>
Date: Mon, 10 Oct 2011 17:41:22 +0000 (+0000)
Subject: Unbreak sending emails using mailTargets() in safe_mode
X-Git-Tag: 1.31.0-rc.0~27165
X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22sites_tous%22%29%20.%20%22?a=commitdiff_plain;h=ac81e1c69768016f9733dddf7c46614f2d879163;p=lhc%2Fweb%2Fwiklou.git

Unbreak sending emails using mailTargets() in safe_mode
---

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();