dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Move exif messages to a separate i18n file"
[lhc/web/wiklou.git]
/
includes
/
DefaultSettings.php
diff --git
a/includes/DefaultSettings.php
b/includes/DefaultSettings.php
index
420da4f
..
f7c3fce
100644
(file)
--- a/
includes/DefaultSettings.php
+++ b/
includes/DefaultSettings.php
@@
-4487,6
+4487,7
@@
$wgCentralIdLookupProvider = 'local';
* commonly chosen. Set to integer n to ban the top n passwords.
* If you want to ban all common passwords on file, use the
* PHP_INT_MAX constant.
* commonly chosen. Set to integer n to ban the top n passwords.
* If you want to ban all common passwords on file, use the
* PHP_INT_MAX constant.
+ * Deprecated since 1.33. Use PasswordNotInLargeBlacklist instead.
* - PasswordNotInLargeBlacklist - Password not in best practices list of
* 100,000 commonly used passwords. Due to the size of the list this
* is a probabilistic test.
* - PasswordNotInLargeBlacklist - Password not in best practices list of
* 100,000 commonly used passwords. Due to the size of the list this
* is a probabilistic test.
@@
-4500,28
+4501,21
@@
$wgPasswordPolicy = [
'bureaucrat' => [
'MinimalPasswordLength' => 10,
'MinimumPasswordLengthToLogin' => 1,
'bureaucrat' => [
'MinimalPasswordLength' => 10,
'MinimumPasswordLengthToLogin' => 1,
- 'PasswordCannotMatchUsername' => true,
- 'PasswordCannotBePopular' => 25,
'PasswordNotInLargeBlacklist' => true,
],
'sysop' => [
'MinimalPasswordLength' => 10,
'MinimumPasswordLengthToLogin' => 1,
'PasswordNotInLargeBlacklist' => true,
],
'sysop' => [
'MinimalPasswordLength' => 10,
'MinimumPasswordLengthToLogin' => 1,
- 'PasswordCannotMatchUsername' => true,
- 'PasswordCannotBePopular' => 25,
'PasswordNotInLargeBlacklist' => true,
],
'interface-admin' => [
'MinimalPasswordLength' => 10,
'MinimumPasswordLengthToLogin' => 1,
'PasswordNotInLargeBlacklist' => true,
],
'interface-admin' => [
'MinimalPasswordLength' => 10,
'MinimumPasswordLengthToLogin' => 1,
- 'PasswordCannotMatchUsername' => true,
- 'PasswordCannotBePopular' => 25,
'PasswordNotInLargeBlacklist' => true,
],
'bot' => [
'MinimalPasswordLength' => 10,
'MinimumPasswordLengthToLogin' => 1,
'PasswordNotInLargeBlacklist' => true,
],
'bot' => [
'MinimalPasswordLength' => 10,
'MinimumPasswordLengthToLogin' => 1,
- 'PasswordCannotMatchUsername' => true,
'PasswordNotInLargeBlacklist' => true,
],
'default' => [
'PasswordNotInLargeBlacklist' => true,
],
'default' => [
@@
-4529,7
+4523,6
@@
$wgPasswordPolicy = [
'PasswordCannotMatchUsername' => true,
'PasswordCannotMatchBlacklist' => true,
'MaximalPasswordLength' => 4096,
'PasswordCannotMatchUsername' => true,
'PasswordCannotMatchBlacklist' => true,
'MaximalPasswordLength' => 4096,
- 'PasswordNotInLargeBlacklist' => false,
],
],
'checks' => [
],
],
'checks' => [
@@
-5892,6
+5885,8
@@
$wgGrantPermissions['delete']['deletelogentry'] = true;
$wgGrantPermissions['delete']['deleterevision'] = true;
$wgGrantPermissions['delete']['undelete'] = true;
$wgGrantPermissions['delete']['deleterevision'] = true;
$wgGrantPermissions['delete']['undelete'] = true;
+$wgGrantPermissions['oversight']['suppressrevision'] = true;
+
$wgGrantPermissions['protect'] = $wgGrantPermissions['editprotected'];
$wgGrantPermissions['protect']['protect'] = true;
$wgGrantPermissions['protect'] = $wgGrantPermissions['editprotected'];
$wgGrantPermissions['protect']['protect'] = true;
@@
-5937,6
+5932,7
@@
$wgGrantPermissionGroups = [
'viewdeleted' => 'administration',
'viewrestrictedlogs' => 'administration',
'protect' => 'administration',
'viewdeleted' => 'administration',
'viewrestrictedlogs' => 'administration',
'protect' => 'administration',
+ 'oversight' => 'administration',
'createaccount' => 'administration',
'highvolume' => 'high-volume',
'createaccount' => 'administration',
'highvolume' => 'high-volume',
@@
-8782,6
+8778,7
@@
$wgSearchRunSuggestedQuery = true;
*
* @see maintenance/createCommonPasswordCdb.php
* @since 1.27
*
* @see maintenance/createCommonPasswordCdb.php
* @since 1.27
+ * @deprecated since 1.33
* @var string path to file
*/
$wgPopularPasswordFile = __DIR__ . '/password/commonpasswords.cdb';
* @var string path to file
*/
$wgPopularPasswordFile = __DIR__ . '/password/commonpasswords.cdb';