X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FDefaultSettings.php;h=c35070a7ddd1ad7c826467f5d10ca8da760f9e6c;hb=8b7b006ca8441f7d8bef8363805e414710c3f2f7;hp=4ad2188e4ed2cf85ee857b71f79efd40c2ad9c90;hpb=7bc2645d4dcb1a3bf19e2d426d44f54fb523fb73;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 4ad2188e4e..c35070a7dd 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -15,7 +15,7 @@ * performed in LocalSettings.php. * * Documentation is in the source and on: - * http://www.mediawiki.org/wiki/Manual:Configuration_settings + * https://www.mediawiki.org/wiki/Manual:Configuration_settings * * @warning Note: this (and other things) will break if the autoloader is not * enabled. Please include includes/AutoLoader.php before including this file. @@ -2256,7 +2256,7 @@ $wgInvalidateCacheOnLocalSettingsChange = true; * although they are referred to as Squid settings for historical reasons. * * Achieving a high hit ratio with an HTTP proxy requires special - * configuration. See http://www.mediawiki.org/wiki/Manual:Squid_caching for + * configuration. See https://www.mediawiki.org/wiki/Manual:Squid_caching for * more details. * * @{ @@ -2264,7 +2264,7 @@ $wgInvalidateCacheOnLocalSettingsChange = true; /** * Enable/disable Squid. - * See http://www.mediawiki.org/wiki/Manual:Squid_caching + * See https://www.mediawiki.org/wiki/Manual:Squid_caching */ $wgUseSquid = false; @@ -3491,9 +3491,21 @@ $wgLegalTitleChars = " %!\"$&'()*,\\-.\\/0-9:;=?@A-Z\\\\^_`a-z~\\x80-\\xFF+"; /** * The interwiki prefix of the current wiki, or false if it doesn't have one. + * + * @deprecated since 1.23; use $wgLocalInterwikis instead */ $wgLocalInterwiki = false; +/** + * Array for multiple $wgLocalInterwiki values, in case there are several + * interwiki prefixes that point to the current wiki. If $wgLocalInterwiki is + * set, its value is prepended to this array, for backwards compatibility. + * + * Note, recent changes feeds use only the first entry in this array (or + * $wgLocalInterwiki, if it is set). See $wgRCFeeds + */ +$wgLocalInterwikis = array(); + /** * Expiry time for cache of interwiki table */ @@ -3915,7 +3927,7 @@ $wgTranscludeCacheExpiry = 3600; * if $wgUseCommaCount is false, it will be 'link', if it is true * it will be 'comma' * - * See also See http://www.mediawiki.org/wiki/Manual:Article_count + * See also See https://www.mediawiki.org/wiki/Manual:Article_count * * Retroactively changing this variable will not affect the existing count, * to update it, you will need to run the maintenance/updateArticleCount.php @@ -3965,6 +3977,13 @@ $wgPasswordSalt = true; */ $wgMinimalPasswordLength = 1; +/** + * Specifies if users should be sent to a password-reset form on login, if their + * password doesn't meet the requirements of User::isValidPassword(). + * @since 1.23 + */ +$wgInvalidPasswordReset = true; + /** * Whether to allow password resets ("enter some identifying data, and we'll send an email * with a temporary password you can use to get back into the account") identified by @@ -4032,7 +4051,6 @@ $wgDefaultUserOptions = array( 'minordefault' => 0, 'newpageshidepatrolled' => 0, 'nickname' => '', - 'noconvertlink' => 0, 'norollbackdiff' => 0, 'numberheadings' => 0, 'previewonfirst' => 0, @@ -4162,7 +4180,7 @@ $wgBlockDisablesLogin = false; * * @note Also that this will only protect _pages in the wiki_. Uploaded files * will remain readable. You can use img_auth.php to protect uploaded files, - * see http://www.mediawiki.org/wiki/Manual:Image_Authorization + * see https://www.mediawiki.org/wiki/Manual:Image_Authorization */ $wgWhitelistRead = false; @@ -4899,7 +4917,7 @@ $wgUseTeX = false; */ /** - * Filename for debug logging. See http://www.mediawiki.org/wiki/How_to_debug + * Filename for debug logging. See https://www.mediawiki.org/wiki/How_to_debug * The debug log file should be not be publicly accessible if it is used, as it * may contain private data. */ @@ -5015,6 +5033,11 @@ $wgShowExceptionDetails = false; /** * If true, show a backtrace for database errors + * + * @note This setting only applies when connection errors and query errors are + * reported in the normal manner. $wgShowExceptionDetails applies in other cases, + * including those in which an uncaught exception is thrown from within the + * exception handler. */ $wgShowDBErrorBacktrace = false; @@ -5181,7 +5204,7 @@ $wgParserTestFiles = array( * * Something like this: * $wgParserTestRemote = array( - * 'api-url' => 'http://www.mediawiki.org/w/api.php', + * 'api-url' => 'https://www.mediawiki.org/w/api.php', * 'repo' => 'MediaWiki', * 'suite' => 'ParserTests', * 'path' => '/trunk/phase3', // not used client-side; for reference @@ -5574,8 +5597,9 @@ $wgRC2UDPPort = false; $wgRC2UDPPrefix = ''; /** - * If this is set to true, $wgLocalInterwiki will be prepended to links in the - * IRC feed. If this is set to a string, that string will be used as the prefix. + * If this is set to true, the first entry in the $wgLocalInterwikis array (or + * the value of $wgLocalInterwiki, if set) will be prepended to links in the IRC + * feed. If this is set to a string, that string will be used as the prefix. * * @deprecated since 1.22, use $wgRCFeeds */ @@ -5603,11 +5627,12 @@ $wgRC2UDPOmitBots = false; * * 'omit_bots' -- whether the bot edits should be in the feed * The IRC-specific options are: * * 'add_interwiki_prefix' -- whether the titles should be prefixed with - * $wgLocalInterwiki. + * the first entry in the $wgLocalInterwikis array (or the value of + * $wgLocalInterwiki, if set) * The JSON-specific options are: * * 'channel' -- if set, the 'channel' parameter is also set in JSON values. * - * To ensure backwards-compatability, whenever $wgRC2UDPAddress is set, a + * To ensure backwards-compatibility, whenever $wgRC2UDPAddress is set, a * 'default' feed will be created reusing the deprecated $wgRC2UDP* variables. * * @example $wgRCFeeds['example'] = array( @@ -5995,7 +6020,7 @@ $wgExtensionMessagesFiles = array(); * @since 1.23 */ $wgMessagesDirs = array( - "$IP/resources/oojs-ui/i18n", + 'oojs-ui' => "$IP/resources/oojs-ui/i18n", ); /** @@ -6587,7 +6612,7 @@ $wgExemptFromUserRobotsControl = null; * Enable the MediaWiki API for convenient access to * machine-readable data via api.php * - * See http://www.mediawiki.org/wiki/API + * See https://www.mediawiki.org/wiki/API */ $wgEnableAPI = true;