X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FDefaultSettings.php;h=c9bed293980c68c7899590c7b5dae85593ab5a49;hb=29977ebe4c05cab4cac46fd1a8459e27f50fb153;hp=5a874d5bcb04203f88f372a625e5f998ae5d8293;hpb=75f1fe04a8006df7b8716c4b966b1725d5d4bea1;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 5a874d5bcb..a6dbe4b662 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -72,7 +72,7 @@ $wgConfigRegistry = [ * MediaWiki version number * @since 1.2 */ -$wgVersion = '1.34.0-alpha'; +$wgVersion = '1.34.0'; /** * Name of the site. It must be changed in LocalSettings.php @@ -95,15 +95,14 @@ $wgAssumeProxiesUseDefaultProtocolPorts = true; * $wgServer = 'http://example.com'; * @endcode * - * This is usually detected correctly by MediaWiki. If MediaWiki detects the - * wrong server, it will redirect incorrectly after you save a page. In that - * case, set this variable to fix it. + * This must be set in LocalSettings.php. The MediaWiki installer does this + * automatically since 1.18. * * If you want to use protocol-relative URLs on your wiki, set this to a * protocol-relative URL like '//example.com' and set $wgCanonicalServer * to a fully qualified URL. */ -$wgServer = WebRequest::detectServer(); +$wgServer = false; /** * Canonical URL of the server, to use in IRC feeds and notification e-mails. @@ -2627,6 +2626,8 @@ $wgLocalisationCacheConf = [ 'store' => 'detect', 'storeClass' => false, 'storeDirectory' => false, + 'storeServer' => [], + 'forceRecache' => false, 'manualRecache' => false, ]; @@ -2733,27 +2734,22 @@ $wgExtensionInfoMTime = false; * although they are sometimes still referred to as Squid settings for * historical reasons. * - * Achieving a high hit ratio with an HTTP proxy requires special - * configuration. See https://www.mediawiki.org/wiki/Manual:Squid_caching for - * more details. + * Achieving a high hit ratio with an HTTP proxy requires special configuration. + * See https://www.mediawiki.org/wiki/Manual:Performance_tuning#Page_view_caching + * for more details. * * @{ */ /** * Enable/disable CDN. - * See https://www.mediawiki.org/wiki/Manual:Squid_caching + * + * See https://www.mediawiki.org/wiki/Manual:Performance_tuning#Page_view_caching * * @since 1.34 Renamed from $wgUseSquid. */ $wgUseCdn = false; -/** - * If you run Squid3 with ESI support, enable this (default:false): - * @deprecated in 1.33. This was a now-defunct experimental feature. - */ -$wgUseESI = false; - /** * Add X-Forwarded-Proto to the Vary and Key headers for API requests and * RSS/Atom feeds. Use this if you have an SSL termination setup @@ -3760,19 +3756,16 @@ $wgIncludeLegacyJavaScript = false; $wgLegacyJavaScriptGlobals = true; /** - * If set to a positive number, ResourceLoader will not generate URLs whose - * query string is more than this many characters long, and will instead use - * multiple requests with shorter query strings. This degrades performance, - * but may be needed if your web server has a low (less than, say 1024) - * query string length limit or a low value for suhosin.get.max_value_length - * that you can't increase. - * - * If set to a negative number, ResourceLoader will assume there is no query - * string length limit. + * ResourceLoader will not generate URLs whose query string is more than + * this many characters long, and will instead use multiple requests with + * shorter query strings. This degrades performance, but may be needed based + * on the query string limit supported by your web server and/or your user's + * web browsers. * - * Defaults to a value based on php configuration. + * @since 1.17 + * @var int */ -$wgResourceLoaderMaxQueryLength = false; +$wgResourceLoaderMaxQueryLength = 2000; /** * If set to true, JavaScript modules loaded from wiki pages will be parsed @@ -4453,7 +4446,8 @@ $wgCentralIdLookupProvider = 'local'; * The checks supported by core are: * - 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 the username. @@ -4466,7 +4460,7 @@ $wgCentralIdLookupProvider = 'local'; * 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. + * is a probabilistic test. * * If you add custom checks, for Special:PasswordPolicies to display them correctly, * every check should have a corresponding passwordpolicies-policy- message, @@ -4484,28 +4478,25 @@ $wgPasswordPolicy = [ 'bureaucrat' => [ 'MinimalPasswordLength' => 10, 'MinimumPasswordLengthToLogin' => 1, - 'PasswordNotInLargeBlacklist' => true, ], 'sysop' => [ 'MinimalPasswordLength' => 10, 'MinimumPasswordLengthToLogin' => 1, - 'PasswordNotInLargeBlacklist' => true, ], 'interface-admin' => [ 'MinimalPasswordLength' => 10, 'MinimumPasswordLengthToLogin' => 1, - 'PasswordNotInLargeBlacklist' => true, ], 'bot' => [ 'MinimalPasswordLength' => 10, 'MinimumPasswordLengthToLogin' => 1, - 'PasswordNotInLargeBlacklist' => true, ], 'default' => [ 'MinimalPasswordLength' => [ 'value' => 1, 'suggestChangeOnLogin' => true ], 'PasswordCannotMatchUsername' => [ 'value' => true, 'suggestChangeOnLogin' => true ], 'PasswordCannotMatchBlacklist' => [ 'value' => true, 'suggestChangeOnLogin' => true ], 'MaximalPasswordLength' => [ 'value' => 4096, 'suggestChangeOnLogin' => true ], + 'PasswordNotInLargeBlacklist' => [ 'value' => true, 'suggestChangeOnLogin' => true ], ], ], 'checks' => [ @@ -4900,6 +4891,7 @@ $wgDefaultUserOptions = [ 'wllimit' => 250, 'useeditwarning' => 1, 'prefershttps' => 1, + 'requireemail' => 0, ]; /** @@ -4969,6 +4961,15 @@ $wgSessionProviders = [ ], ]; +/** + * Temporary feature flag that controls whether users will see a checkbox allowing them to + * require providing email during password resets. + * + * @deprecated This feature is under development, don't assume this flag's existence or function + * outside of MediaWiki. + */ +$wgAllowRequiringEmailForResets = false; + /** @} */ # end user accounts } /************************************************************************//** @@ -4992,6 +4993,8 @@ $wgBlockAllowsUTEdit = true; /** * Allow sysops to ban users from accessing Emailuser + * @deprecated since 1.34; `$wgGroupPermissions['sysop']['blockemail'] = true;` + * should be used instead */ $wgSysopEmailBans = true; @@ -6074,7 +6077,7 @@ $wgSessionName = false; * which case there is a possibility of an attacker discovering the names of revdeleted users, so * it is best to use this in conjunction with $wgSecretKey being set). */ -$wgCookieSetOnAutoblock = false; +$wgCookieSetOnAutoblock = true; /** * Whether to set a cookie when a logged-out user is blocked. Doing so means that a blocked user, @@ -6083,7 +6086,7 @@ $wgCookieSetOnAutoblock = false; * case there is a possibility of an attacker discovering the names of revdeleted users, so it * is best to use this in conjunction with $wgSecretKey being set). */ -$wgCookieSetOnIpBlock = false; +$wgCookieSetOnIpBlock = true; /** @} */ # end of cookie settings } @@ -6150,9 +6153,8 @@ $wgDebugComments = false; * Write SQL queries to the debug log. * * This setting is only used $wgLBFactoryConf['class'] is set to - * '\Wikimedia\Rdbms\LBFactorySimple' and $wgDBservers is an empty array; otherwise - * the DBO_DEBUG flag must be set in the 'flags' option of the database - * connection to achieve the same functionality. + * '\Wikimedia\Rdbms\LBFactorySimple'; otherwise the DBO_DEBUG flag must be set in + * the 'flags' option of the database connection to achieve the same functionality. */ $wgDebugDumpSql = false; @@ -7935,6 +7937,7 @@ $wgAllowSpecialInclusion = true; /** * Set this to an array of special page names to prevent * maintenance/updateSpecialPages.php from updating those pages. + * Mapping each special page name to an run mode like 'periodical' if a cronjob is set up. */ $wgDisableQueryPageUpdate = false; @@ -8484,10 +8487,23 @@ $wgUpdateRowsPerQuery = 100; */ /** - * Name of the external diff engine to use. Supported values: - * * string: path to an external diff executable - * * false: wikidiff2 PHP/HHVM module if installed, otherwise the default PHP implementation - * * 'wikidiff', 'wikidiff2', and 'wikidiff3' are treated as false for backwards compatibility + * Specify the difference engine to use. + * + * Supported values: + * - 'external': Use an external diff engine, which must be specified via $wgExternalDiffEngine + * - 'wikidiff2': Use the wikidiff2 PHP extension + * - 'php': PHP implementations included in MediaWiki + * + * The default (null) is to use the first engine that's available. + * + * @since 1.34 + * @var string|null + */ +$wgDiffEngine = null; + +/** + * Name of the external diff engine to use. + * @var string|false Path to an external diff executable */ $wgExternalDiffEngine = false; @@ -8621,6 +8637,7 @@ $wgContentHandlerTextFallback = 'ignore'; * handling is less robust and less flexible. * * @since 1.21 + * @deprecated since 1.34, and should always be set true. */ $wgContentHandlerUseDB = true; @@ -8678,7 +8695,7 @@ $wgHttpsPort = 443; $wgSessionSecret = false; /** - * If for some reason you can't install the PHP OpenSSL or mcrypt extensions, + * If for some reason you can't install the PHP OpenSSL extension, * you can set this to true to make MediaWiki work again at the cost of storing * sensitive session data insecurely. But it would be much more secure to just * install the OpenSSL extension. @@ -8983,7 +9000,7 @@ $wgInterwikiPrefixDisplayTypes = []; * @since 1.32 * @var int An appropriate combination of SCHEMA_COMPAT_XXX flags. */ -$wgMultiContentRevisionSchemaMigrationStage = SCHEMA_COMPAT_WRITE_BOTH | SCHEMA_COMPAT_READ_NEW; +$wgMultiContentRevisionSchemaMigrationStage = SCHEMA_COMPAT_NEW; /** * The schema to use per default when generating XML dumps. This allows sites to control @@ -8991,24 +9008,6 @@ $wgMultiContentRevisionSchemaMigrationStage = SCHEMA_COMPAT_WRITE_BOTH | SCHEMA_ */ $wgXmlDumpSchemaVersion = XML_DUMP_SCHEMA_VERSION_10; -/** - * Actor table schema migration stage. - * - * Use the SCHEMA_COMPAT_XXX flags. Supported values: - * - SCHEMA_COMPAT_OLD - * - SCHEMA_COMPAT_WRITE_BOTH | SCHEMA_COMPAT_READ_OLD - * - SCHEMA_COMPAT_WRITE_BOTH | SCHEMA_COMPAT_READ_NEW - * - SCHEMA_COMPAT_NEW - * - * Note that reading the old and new schema at the same time is not supported - * in 1.32, but was (with significant query performance issues) in 1.31. - * - * @since 1.31 - * @since 1.32 changed allowed flags - * @var int An appropriate combination of SCHEMA_COMPAT_XXX flags. - */ -$wgActorTableSchemaMigrationStage = SCHEMA_COMPAT_NEW; - /** * Flag to enable Partial Blocks. This allows an admin to prevent a user from editing specific pages * or namespaces. @@ -9109,6 +9108,16 @@ $wgSpecialSearchFormOptions = []; */ $wgNativeImageLazyLoading = false; +/** + * Option to whether serve the main page as the domain root + * + * @warning EXPERIMENTAL! + * + * @since 1.34 + * @var bool + */ +$wgMainPageIsDomainRoot = false; + /** * For really cool vim folding this needs to be at the end: * vim: foldmarker=@{,@} foldmethod=marker