X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FDefaultSettings.php;h=6b937eab26a7c5332cf2971002cc44f6dbbbfb19;hb=10f0683134e1b23fea30f76ccc401e66f50e068a;hp=de29f0d2aec0f732c6a4cbf6c0f19fa8a642ae57;hpb=60053df278bc65499e01bf21f2854ddf7a208c2e;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index de29f0d2ae..7e237636f5 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -1383,7 +1383,7 @@ $wgDjvuOutputExtension = 'jpg'; /** * Site admin email address. * - * Defaults to "wikiadmin@{$wgServerName}". + * Defaults to "wikiadmin@$wgServerName". */ $wgEmergencyContact = false; @@ -1392,7 +1392,7 @@ $wgEmergencyContact = false; * * The address we should use as sender when a user is requesting his password. * - * Defaults to "apache@{$wgServerName}". + * Defaults to "apache@$wgServerName". */ $wgPasswordSender = false; @@ -1702,6 +1702,9 @@ $wgAllDBsAreLocalhost = false; * $wgSharedPrefix is the table prefix for the shared database. It defaults to * $wgDBprefix. * + * $wgSharedSchema is the table schema for the shared database. It defaults to + * $wgDBmwschema. + * * @deprecated since 1.21 In new code, use the $wiki parameter to wfGetLB() to * access remote databases. Using wfGetLB() allows the shared database to * reside on separate servers to the wiki's own database, with suitable @@ -1719,6 +1722,12 @@ $wgSharedPrefix = false; */ $wgSharedTables = array( 'user', 'user_properties' ); +/** + * @see $wgSharedDB + * @since 1.23 + */ +$wgSharedSchema = false; + /** * Database load balancer * This is a two-dimensional array, an array of server info structures @@ -2715,8 +2724,8 @@ $wgBrowserBlackList = array( $wgLegacySchemaConversion = false; /** - * Enable dates like 'May 12' instead of '12 May', this only takes effect if - * the interface is set to English. + * Enable dates like 'May 12' instead of '12 May', if the default date format + * is 'dmy or mdy'. */ $wgAmericanDates = false; @@ -3079,6 +3088,7 @@ $wgEditPageFrameOptions = 'DENY'; * - 'DENY': Do not allow framing. This is recommended for most wikis. * - 'SAMEORIGIN': Allow framing by pages on the same domain. * - false: Allow all framing. + * Note: $wgBreakFrames will override this for human formatted API output. */ $wgApiFrameOptions = 'DENY'; @@ -3184,6 +3194,16 @@ $wgShowRollbackEditCount = 10; */ $wgEnableCanonicalServerLink = false; +/** + * When OutputHandler is used, mangle any output that contains + * . Without this, an attacker can send their own + * cross-domain policy unless it is prevented by the crossdomain.xml file at + * the domain root. + * + * @since 1.25 + */ +$wgMangleFlashPolicy = true; + /** @} */ # End of output format settings } /*************************************************************************//** @@ -3557,6 +3577,19 @@ $wgResourceLoaderStorageEnabled = false; */ $wgResourceLoaderStorageVersion = 1; +/** + * Whether to allow site-wide CSS (MediaWiki:Common.css and friends) on + * restricted pages like Special:UserLogin or Special:Preferences where + * JavaScript is disabled for security reasons. As it is possible to + * execute JavaScript through CSS, setting this to true opens up a + * potential security hole. Some sites may "skin" their wiki by using + * site-wide CSS, causing restricted pages to look unstyled and different + * from the rest of the site. + * + * @since 1.25 + */ +$wgAllowSiteCSSOnRestrictedPages = false; + /** @} */ # End of resource loader settings } /*************************************************************************//** @@ -3721,6 +3754,18 @@ $wgInterwikiFallbackSite = 'wiki'; /** @} */ # end of Interwiki caching settings. +/** + * @name SiteStore caching settings. + * @{ + */ + +/** + * Specify the file location for the SiteStore json cache file. + */ +$wgSitesCacheFile = false; + +/** @} */ # end of SiteStore caching settings. + /** * If local interwikis are set up which allow redirects, * set this regexp to restrict URLs which will be displayed @@ -3797,6 +3842,7 @@ $wgNamespacesWithSubpages = array( $wgTrackingCategories = array( 'index-category', 'noindex-category', + 'duplicate-args-category', 'expensive-parserfunction-category', 'post-expand-template-argument-category', 'post-expand-template-inclusion-category', @@ -4115,15 +4161,6 @@ $wgTranscludeCacheExpiry = 3600; */ $wgArticleCountMethod = 'link'; -/** - * wgHitcounterUpdateFreq sets how often page counters should be updated, higher - * values are easier on the database. A value of 1 causes the counters to be - * updated on every hit, any higher value n cause them to update *on average* - * every n hits. Should be set to either 1 or something largish, eg 1000, for - * maximum efficiency. - */ -$wgHitcounterUpdateFreq = 1; - /** * How many days user must be idle before he is considered inactive. Will affect * the number shown on Special:Statistics, Special:ActiveUsers, and the @@ -5223,6 +5260,26 @@ $wgDebugDumpSqlLength = 500; */ $wgDebugLogGroups = array(); +/** + * Default service provider for creating MWLogger instances. + * + * The value should be an array suitable for use with + * ObjectFactory::getObjectFromSpec(). The created object is expected to + * implement the MWLoggerSpi interface. See ObjectFactory for additional + * details. + * + * Alternately the MWLogger::registerProvider method can be called to inject + * an MWLoggerSpi instance into MWLogger and bypass the use of this + * configuration variable entirely. + * + * @since 1.25 + * @var array $wgMWLoggerDefaultSpi + * @see MwLogger + */ +$wgMWLoggerDefaultSpi = array( + 'class' => 'MWLoggerLegacySpi', +); + /** * Display debug data at the bottom of the main content area. * @@ -5330,14 +5387,18 @@ $wgProfilePerHost = false; * The host should be running a daemon which can be obtained from MediaWiki * Git at: * http://git.wikimedia.org/tree/operations%2Fsoftware.git/master/udpprofile + * + * @deprecated set $wgProfiler['udphost'] instead */ -$wgUDPProfilerHost = '127.0.0.1'; +$wgUDPProfilerHost = null; /** * Port for UDP profiler. * @see $wgUDPProfilerHost + * + * @deprecated set $wgProfiler['udpport'] instead */ -$wgUDPProfilerPort = '3811'; +$wgUDPProfilerPort = null; /** * Format string for the UDP profiler. The UDP profiler invokes sprintf() with @@ -5347,8 +5408,10 @@ $wgUDPProfilerPort = '3811'; * * @see $wgStatsFormatString * @since 1.22 + * + * @deprecated set $wgProfiler['udpformat'] instead */ -$wgUDPProfilerFormatString = "%s - %d %f %f %f %f %s\n"; +$wgUDPProfilerFormatString = null; /** * Output debug message on every wfProfileIn/wfProfileOut @@ -5384,12 +5447,6 @@ $wgAggregateStatsID = false; */ $wgStatsFormatString = "stats/%s - %s 1 1 1 1 %s\n"; -/** - * Whereas to count the number of time an article is viewed. - * Does not work if pages are cached (for example with squid). - */ -$wgDisableCounters = false; - /** * InfoAction retrieves a list of transclusion links (both to and from). * This number puts a limit on that query in the case of highly transcluded @@ -5489,9 +5546,24 @@ $wgSearchHighlightBoundaries = '[\p{Z}\p{P}\p{C}]'; * PHP wrapper to avoid firing up mediawiki for every keystroke * * Placeholders: {searchTerms} + * + * @deprecated since 1.25 Use $wgOpenSearchTemplates['application/x-suggestions+json'] instead */ $wgOpenSearchTemplate = false; +/** + * Templates for OpenSearch suggestions, defaults to API action=opensearch + * + * Sites with heavy load would typically have these point to a custom + * PHP wrapper to avoid firing up mediawiki for every keystroke + * + * Placeholders: {searchTerms} + */ +$wgOpenSearchTemplates = array( + 'application/x-suggestions+json' => false, + 'application/x-suggestions+xml' => false, +); + /** * Enable OpenSearch suggestions requested by MediaWiki. Set this to * false if you've disabled scripts that use api?action=opensearch and @@ -5506,6 +5578,11 @@ $wgEnableOpenSearchSuggest = true; */ $wgOpenSearchDefaultLimit = 10; +/** + * Minimum length of extract in . Actual extracts will last until the end of sentence. + */ +$wgOpenSearchDescriptionLength = 100; + /** * Expiry time for search suggestion responses */ @@ -6590,7 +6667,6 @@ $wgLogActions = array( 'protect/move_prot' => 'movedarticleprotection', 'import/upload' => 'import-logentry-upload', 'import/interwiki' => 'import-logentry-interwiki', - 'merge/merge' => 'pagemerge-logentry', 'suppress/block' => 'blocklogentry', 'suppress/reblock' => 'reblock-logentry', ); @@ -6617,6 +6693,7 @@ $wgLogActionsHandlers = array( 'upload/upload' => 'LogFormatter', 'upload/overwrite' => 'LogFormatter', 'upload/revert' => 'LogFormatter', + 'merge/merge' => 'MergeLogFormatter', ); /** @@ -7290,13 +7367,21 @@ $wgPagePropsHaveSortkey = true; $wgHttpsPort = 443; /** - * Secret and algorithm for hmac-based key derivation function (fast, + * Secret for hmac-based key derivation function (fast, * cryptographically secure random numbers). * This should be set in LocalSettings.php, otherwise wgSecretKey will * be used. + * See also: $wgHKDFAlgorithm * @since 1.24 */ $wgHKDFSecret = false; + +/** + * Algorithm for hmac-based key derivation function (fast, + * cryptographically secure random numbers). + * See also: $wgHKDFSecret + * @since 1.24 + */ $wgHKDFAlgorithm = 'sha256'; /**