From: Alexandre Emsenhuber <ialex@users.mediawiki.org>
Date: Sat, 14 Jan 2012 14:53:32 +0000 (+0000)
Subject: No need to do the safe_mode check on every request in $wgAdditionalMailParams is... 
X-Git-Tag: 1.31.0-rc.0~25273
X-Git-Url: http://git.cyclocoop.org/ecrire?a=commitdiff_plain;h=66587c2574366f8ed761f0b4b3deba5dbbcf2b6d;p=lhc%2Fweb%2Fwiklou.git

No need to do the safe_mode check on every request in $wgAdditionalMailParams is set; that variable will not be passed to mail() if safe_mode is enabled since r99411
---

diff --git a/includes/Setup.php b/includes/Setup.php
index 5db6b0b90f..fe9818aee1 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -498,12 +498,6 @@ $wgTitle = null;
 
 $wgDeferredUpdateList = array();
 
-// We need to check for safe_mode, because mail() will throw an E_NOTICE
-// on additional parameters
-if( !is_null($wgAdditionalMailParams) && wfIniGetBool('safe_mode') ) {
-	$wgAdditionalMailParams = null;
-}
-
 wfProfileOut( $fname . '-globals' );
 wfProfileIn( $fname . '-extensions' );