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

diff --git a/RELEASE-NOTES-1.26 b/RELEASE-NOTES-1.26
index 81269b8..46ffe36 100644 (file)
--- 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 70ae468..baefef9 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -4439,7 +4439,7 @@ $wgPasswordConfig = array(
  */
 $wgPasswordResetRoutes = array(
        'username' => true,
-       'email' => false,
+       'email' => true,
 );
 
 /**