Removed the emailconfirmed group by default, since it is slow when combined with...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 2cc5255..fcbcedf 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -30,6 +30,9 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   $wgUserNotifiedOnAllChanges
 * (bug 12860) New option $wgSitemapNamespaces allows sitemaps to be generated
   for only some namespaces
+* Removed the emailconfirmed implicit group by default. To re-add it, use:
+    $wgAutopromote['emailconfirmed'] = APCOND_EMAILCONFIRMED;
+  in your LocalSettings.php.
 
 === New features in 1.13 ===
 

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index de89f28..848a83e 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1107,10 +1107,6 @@ $wgGroupPermissions['user' ]['purge']            = true; // can use ?action=purg
 // Implicit group for accounts that pass $wgAutoConfirmAge
 $wgGroupPermissions['autoconfirmed']['autoconfirmed'] = true;
 
-// Implicit group for accounts with confirmed email addresses
-// This has little use when email address confirmation is off
-$wgGroupPermissions['emailconfirmed']['emailconfirmed'] = true;
-
 // Users with bot privilege can have their edits hidden
 // from various log pages by default
 $wgGroupPermissions['bot'  ]['bot']              = true;
@@ -1261,7 +1257,6 @@ $wgAutopromote = array(
                array( APCOND_EDITCOUNT, &$wgAutoConfirmCount ),
                array( APCOND_AGE, &$wgAutoConfirmAge ),
        ),
-       'emailconfirmed' => APCOND_EMAILCONFIRMED,
 );
 
 /**
@@ -3047,4 +3042,4 @@ $wgExpensiveParserFunctionLimit = 100;
  * maintenance/generateSitemap.php script is run, or false
  * if one is to be generated for all namespaces.
  */
-$wgSitemapNamespaces = false;
\ No newline at end of file
+$wgSitemapNamespaces = false;