X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FDefaultSettings.php;h=48995a478838b5ade5822f90fa60ccea73289b1f;hb=0c2a0e4d6bbda94f5411fbb13432f8f3dd52eaa3;hp=7cd5cc82aec88759a82ff4ceb02f4333d9ca41a9;hpb=04d6b4a0df232a814116b07b61699cbffefc2986;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 7cd5cc82ae..48995a4788 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -33,7 +33,7 @@ $wgConf = new SiteConfiguration; /** @endcond */ /** MediaWiki version number */ -$wgVersion = '1.19alpha'; +$wgVersion = '1.20alpha'; /** Name of the site. It must be changed in LocalSettings.php */ $wgSitename = 'MediaWiki'; @@ -453,6 +453,10 @@ $wgAllowCopyUploads = false; * This feature is experimental and broken as of r81612. */ $wgAllowAsyncCopyUploads = false; +/** + * A list of domains copy uploads can come from + */ +$wgCopyUploadsDomains = array(); /** * Max size for uploads, in bytes. If not set to an array, applies to all @@ -1697,6 +1701,8 @@ $wgStyleVersion = '303'; * This will cache static pages for non-logged-in users to reduce * database traffic on public sites. * Must set $wgShowIPinHeader = false + * ResourceLoader requests to default language and skins are cached + * as well as single module requests. */ $wgUseFileCache = false; @@ -1750,8 +1756,6 @@ $wgSidebarCacheExpiry = 86400; /** * When using the file cache, we can store the cached HTML gzipped to save disk * space. Pages will then also be served compressed to clients that support it. - * THIS IS NOT COMPATIBLE with ob_gzhandler which is now enabled if supported in - * the default LocalSettings.php! If you enable this, remove that setting first. * * Requires zlib support enabled in PHP. */ @@ -1857,23 +1861,58 @@ $wgSquidServersNoPurge = array(); /** Maximum number of titles to purge in any one client operation */ $wgMaxSquidPurgeTitles = 400; +/** + * Routing configuration for HTCP multicast purging. Add elements here to + * enable HTCP and determine which purges are sent where. If set to an empty + * array, HTCP is disabled. + * + * Each key in this array is a regular expression to match against the purged + * URL, or an empty string to match all URLs. The purged URL is matched against + * the regexes in the order specified, and the first rule whose regex matches + * is used. + * + * Example configuration to send purges for upload.wikimedia.org to one + * multicast group and all other purges to another: + * $wgHTCPMulticastRouting = array( + * '|^https?://upload\.wikimedia\.org|' => array( + * 'host' => '239.128.0.113', + * 'port' => 4827, + * ), + * '' => array( + * 'host' => '239.128.0.112', + * 'port' => 4827, + * ), + * ); + * + * @see $wgHTCPMulticastTTL + */ +$wgHTCPMulticastRouting = array(); + /** * HTCP multicast address. Set this to a multicast IP address to enable HTCP. * * Note that MediaWiki uses the old non-RFC compliant HTCP format, which was * present in the earliest Squid implementations of the protocol. + * + * This setting is DEPRECATED in favor of $wgHTCPMulticastRouting , and kept + * for backwards compatibility only. If $wgHTCPMulticastRouting is set, this + * setting is ignored. If $wgHTCPMulticastRouting is not set and this setting + * is, it is used to populate $wgHTCPMulticastRouting. + * + * @deprecated in favor of $wgHTCPMulticastRouting */ $wgHTCPMulticastAddress = false; /** * HTCP multicast port. + * @deprecated in favor of $wgHTCPMulticastRouting * @see $wgHTCPMulticastAddress */ $wgHTCPPort = 4827; /** * HTCP multicast TTL. - * @see $wgHTCPMulticastAddress + * @see $wgHTCPMulticastRouting */ $wgHTCPMulticastTTL = 1; @@ -2174,6 +2213,17 @@ $wgLocaltimezone = null; */ $wgLocalTZoffset = null; +/** + * If set to true, this will roll back a few bug fixes introduced in 1.19, + * emulating the 1.18 behaviour, to avoid introducing bug 34832. In 1.19, + * language variant conversion is disabled in interface messages. Setting this + * to true re-enables it. + * + * This variable should be removed (implicitly false) in 1.20 or earlier. + */ +$wgBug34832TransitionalRollback = true; + + /** @} */ # End of language/charset settings /*************************************************************************//** @@ -2280,6 +2330,7 @@ $wgXhtmlNamespaces = array(); /** * Show IP address, for non-logged in users. It's necessary to switch this off * for some forms of caching. + * Will disable file cache. */ $wgShowIPinHeader = true; @@ -2565,13 +2616,6 @@ $wgResourceLoaderMaxage = array( ), ); -/** - * Whether to embed private modules inline with HTML output or to bypass - * caching and check the user parameter against $wgUser to prevent - * unauthorized access to private modules. - */ -$wgResourceLoaderInlinePrivateModules = true; - /** * The default debug mode (on/off) for of ResourceLoader requests. This will still * be overridden when the debug URL parameter is used. @@ -2604,6 +2648,19 @@ $wgResourceLoaderMinifierMaxLineLength = 1000; */ $wgIncludeLegacyJavaScript = true; +/** + * Whether to preload the mediawiki.util module as blocking module in the top queue. + * Before MediaWiki 1.19, modules used to load slower/less asynchronous which allowed + * modules to lack dependencies on 'popular' modules that were likely loaded already. + * This setting is to aid scripts during migration by providing mediawiki.util + * unconditionally (which was the most commonly missed dependency). + * It doesn't cover all missing dependencies obviously but should fix most of them. + * This should be removed at some point after site/user scripts have been fixed. + * Enable this if your wiki has a large amount of user/site scripts that are lacking + * dependencies. + */ +$wgPreloadJavaScriptMwUtil = false; + /** * Whether or not to assing configuration variables to the global window object. * If this is set to false, old code using deprecated variables like: @@ -3192,6 +3249,7 @@ $wgReservedUsernames = array( */ $wgDefaultUserOptions = array( 'ccmeonemails' => 0, + 'cols' => 80, 'date' => 'default', 'diffonly' => 0, 'disablemail' => 0, @@ -3212,7 +3270,6 @@ $wgDefaultUserOptions = array( 'gender' => 'unknown', 'hideminor' => 0, 'hidepatrolled' => 0, - 'highlightbroken' => 1, 'imagesize' => 2, 'justify' => 0, 'math' => 1, @@ -3760,7 +3817,7 @@ $wgSummarySpamRegex = array(); * - false : let it through * * @deprecated since 1.17 Use hooks. See SpamBlacklist extension. - * @var callback + * @var $wgFilterCallback bool|string|Closure */ $wgFilterCallback = false; @@ -4030,6 +4087,11 @@ $wgDebugRawPage = false; */ $wgDebugComments = false; +/** + * Extensive database transaction state debugging + */ +$wgDebugDBTransactions = false; + /** * Write SQL queries to the debug log */ @@ -4102,7 +4164,7 @@ $wgDevelopmentWarnings = false; * development warnings will not be generated for deprecations added in releases * after the limit. */ -$wgDeprecationReleaseLimit = '1.17'; +$wgDeprecationReleaseLimit = false; /** Only record profiling info for pages that took longer than this */ $wgProfileLimit = 0.0; @@ -4206,7 +4268,17 @@ $wgEnableJavaScriptTest = false; */ $wgJavaScriptTestConfig = array( 'qunit' => array( + // Page where documentation can be found relevant to the QUnit test suite being ran. + // Used in the intro paragraph on [[Special:JavaScriptTest/qunit]] for the + // documentation link in the "javascripttest-qunit-intro" message. 'documentation' => '//www.mediawiki.org/wiki/Manual:JavaScript_unit_testing', + // If you are submitting the QUnit test suite to a TestSwarm instance, + // point this to the "inject.js" script of that instance. This is was registers + // the QUnit hooks to extract the test results and push them back up into the + // TestSwarm database. + // @example 'http://localhost/testswarm/js/inject.js' + // @example '//integration.mediawiki.org/testswarm/js/inject.js' + 'testswarm-injectjs' => false, ), ); @@ -4220,6 +4292,7 @@ $wgCachePrefix = false; /** * Display the new debugging toolbar. This also enables profiling on database * queries and other useful output. + * Will disable file cache. * * @since 1.19 */ @@ -5304,24 +5377,24 @@ $wgMaxRedirectLinksRetrieved = 500; * Unsetting core actions will probably cause things to complain loudly. */ $wgActions = array( - 'credits' => true, - 'delete' => true, - 'edit' => true, - 'history' => true, - 'info' => true, - 'markpatrolled' => true, - 'protect' => true, - 'purge' => true, - 'raw' => true, - 'render' => true, - 'revert' => true, + 'credits' => true, + 'delete' => true, + 'edit' => true, + 'history' => true, + 'info' => true, + 'markpatrolled' => true, + 'protect' => true, + 'purge' => true, + 'raw' => true, + 'render' => true, + 'revert' => true, 'revisiondelete' => true, - 'rollback' => true, - 'submit' => true, - 'unprotect' => true, - 'unwatch' => true, - 'view' => true, - 'watch' => true, + 'rollback' => true, + 'submit' => true, + 'unprotect' => true, + 'unwatch' => true, + 'view' => true, + 'watch' => true, ); /**