X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2FDefaultSettings.php;h=29e3366c870031064385bc27d97dff00dac07d47;hb=0441c8194107fb48f056a8732d2f2c64cc0232e5;hp=ed88859d7ef0aaaf257debe72b27018b32b5dd12;hpb=df0fe79fcbe089d654163b598aca63d0ae39c645;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index ed88859d7e..29e3366c87 100644
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -71,7 +71,7 @@ $wgConfigRegistry = [
  * MediaWiki version number
  * @since 1.2
  */
-$wgVersion = '1.31.0-rc.0';
+$wgVersion = '1.31.6';
 
 /**
  * Name of the site. It must be changed in LocalSettings.php
@@ -2032,6 +2032,8 @@ $wgDBerrorLogTZ = false;
  * Even correct usage may cause failures with Unicode supplementary
  * characters (those not in the Basic Multilingual Plane) unless MySQL
  * has enhanced their Unicode support.
+ *
+ * @deprecated since 1.31
  */
 $wgDBmysql5 = false;
 
@@ -4470,7 +4472,8 @@ $wgCentralIdLookupProvider = 'local';
  * Statements:
  *	- MinimalPasswordLength - minimum length a user can set
  *	- MinimumPasswordLengthToLogin - passwords shorter than this will
- *		not be allowed to login, regardless if it is correct.
+ *		not be allowed to login, or offered a chance to reset their password
+ *		as part of the login workflow, regardless if it is correct.
  *	- MaximalPasswordLength - maximum length password a user is allowed
  *		to attempt. Prevents DoS attacks with pbkdf2.
  *	- PasswordCannotMatchUsername - Password cannot match username to
@@ -5679,6 +5682,10 @@ $wgRateLimits = [
 		'newbie' => [ 5, 86400 ],
 		'user' => [ 20, 86400 ],
 	],
+	'changeemail' => [
+		'ip-all' => [ 10, 3600 ],
+		'user' => [ 4, 86400 ]
+	],
 	// Purging pages
 	'purge' => [
 		'ip' => [ 30, 60 ],