From: withoutaname <drevitchi@gmail.com>
Date: Fri, 9 May 2014 08:24:27 +0000 (-0700)
Subject: If $wgEnableEmail is false, disable other email settings
X-Git-Tag: 1.31.0-rc.0~15021^2
X-Git-Url: http://git.cyclocoop.org/%22.%24h.%22?a=commitdiff_plain;h=493855da50066959c1a88810ef6ce7722d73414d;p=lhc%2Fweb%2Fwiklou.git

If $wgEnableEmail is false, disable other email settings

Bug: 63678
Change-Id: I8464f540f4bd850d6be1c578b043d9702ed8e773
---

diff --git a/includes/Setup.php b/includes/Setup.php
index 78655a45de..145f55a6d0 100644
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@ -627,6 +627,26 @@ $wgTitle = null;
 
 $wgDeferredUpdateList = array();
 
+// Disable all other email settings automatically if $wgEnableEmail
+// is set to false. - bug 63678
+if ( !$wgEnableEmail ) {
+	$wgAllowHTMLEmail = false;
+	$wgEmailAuthentication = false; // do not require auth if you're not sending email anyway
+	$wgEnableUserEmail = false;
+	$wgEnotifFromEditor = false;
+	$wgEnotifImpersonal = false;
+	$wgEnotifMaxRecips = 0;
+	$wgEnotifMinorEdits = false;
+	$wgEnotifRevealEditorAddress = false;
+	$wgEnotifUseJobQ = false;
+	$wgEnotifUseRealName = false;
+	$wgEnotifUserTalk = false;
+	$wgEnotifWatchlist = false;
+	unset( $wgGroupPermissions['user']['sendemail'] );
+	$wgUserEmailUseReplyTo = false;
+	$wgUsersNotifiedOnAllChanges = array();
+}
+
 wfProfileOut( $fname . '-globals' );
 wfProfileIn( $fname . '-extensions' );