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

diff --cc includes/Setup.php
index cddb30b,15fe94a..8b2138b
--- 1/includes/Setup.php
--- 2/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' );