From: Aaron Schulz <aschulz@wikimedia.org>
Date: Fri, 12 Sep 2014 22:37:05 +0000 (+0000)
Subject: Merge "Group E-mail settings stuff in Setup.php"
X-Git-Tag: 1.31.0-rc.0~14051
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/comptes/ajouter.php?a=commitdiff_plain;h=16a9dd96bd5d7bec87c83d47fb954f2e7934dffe;p=lhc%2Fweb%2Fwiklou.git

Merge "Group E-mail settings stuff in Setup.php"
---

16a9dd96bd5d7bec87c83d47fb954f2e7934dffe
diff --cc includes/Setup.php
index cddb30bd4d,15fe94a75b..8b2138bd36
--- a/includes/Setup.php
+++ b/includes/Setup.php
@@@ -595,32 -633,8 +616,12 @@@ if ( !is_object( $wgAuth ) ) 
   */
  $wgTitle = null;
  
 +/**
 + * @deprecated since 1.24 Use DeferredUpdates::addUpdate instead
 + * @var array
 + */
  $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' );