From: Nemo bis <federicoleva@tiscali.it>
Date: Sat, 18 Jul 2015 16:19:19 +0000 (+0200)
Subject: Set $wgPasswordResetRoutes['email'] = true by default
X-Git-Tag: 1.31.0-rc.0~10725^2
X-Git-Url: http://git.cyclocoop.org/%22.%24h.%22?a=commitdiff_plain;h=6f317cab947c5e0e507f9040c1652d49163ca1b6;p=lhc%2Fweb%2Fwiklou.git

Set $wgPasswordResetRoutes['email'] = true by default

It was not only for worries about large wikis, see 3ef8a83c0.
Wikipedia has been using it for a long while.

Change-Id: Ibab7fa860ba3ab56366c63626516e69984cd1934
---

diff --git a/RELEASE-NOTES-1.26 b/RELEASE-NOTES-1.26
index 81269b8608..46ffe3619a 100644
--- a/RELEASE-NOTES-1.26
+++ b/RELEASE-NOTES-1.26
@@ -9,6 +9,7 @@ MediaWiki 1.26 is an alpha-quality branch and is not recommended for use in
 production.
 
 === Configuration changes in 1.26 ===
+* $wgPasswordResetRoutes['email'] = true by default.
 * $wgEnableParserCache was deprecated, set $wgParserCacheType to CACHE_NONE
   instead if you want to disable the parser cache.
 * New-style continuation is now the default for API action=continue. Clients may
diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 70ae4682de..baefef91ef 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -4439,7 +4439,7 @@ $wgPasswordConfig = array(
  */
 $wgPasswordResetRoutes = array(
 	'username' => true,
-	'email' => false,
+	'email' => true,
 );
 
 /**