X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2FDefaultSettings.php;h=c0aad5df045cf93c1434acbd1331be17a2b80684;hb=5befb9b74790a99aec5514ad8f8784a4fb085288;hp=7a9813b2022ad2fb92edb49bd0225c31710840cf;hpb=cec421ac9d23527413d49b7567c24e414d0b277a;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 7a9813b202..c0aad5df04 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -1860,12 +1860,6 @@ $wgDBservers = false; */ $wgLBFactoryConf = array( 'class' => 'LBFactorySimple' ); -/** - * How long to wait for a slave to catch up to the master - * @deprecated since 1.24 - */ -$wgMasterWaitTimeout = 10; - /** * File to log database errors to */ @@ -3617,13 +3611,6 @@ $wgResourceLoaderValidateJS = true; */ $wgResourceLoaderValidateStaticJS = false; -/** - * If set to true, asynchronous loading of bottom-queue scripts in the "" - * will be enabled. This is an experimental feature that's supposed to make - * JavaScript load faster. - */ -$wgResourceLoaderExperimentalAsyncLoading = false; - /** * Global LESS variables. An associative array binding variable names to * LESS code snippets representing their values. @@ -3733,8 +3720,8 @@ $wgMetaNamespaceTalk = false; * Additional namespaces. If the namespaces defined in Language.php and * Namespace.php are insufficient, you can create new ones here, for example, * to import Help files in other languages. You can also override the namespace - * names of existing namespaces. Extensions developers should use - * $wgCanonicalNamespaceNames. + * names of existing namespaces. Extensions should use the CanonicalNamespaces + * hook or extension.json. * * @warning Once you delete a namespace, the pages in that namespace will * no longer be accessible. If you rename it, then you can access them through @@ -4503,7 +4490,6 @@ $wgDefaultUserOptions = array( 'gender' => 'unknown', 'hideminor' => 0, 'hidepatrolled' => 0, - 'hidecategorization' => 0, 'imagesize' => 2, 'math' => 1, 'minordefault' => 0, @@ -4535,7 +4521,6 @@ $wgDefaultUserOptions = array( 'watchlisthideminor' => 0, 'watchlisthideown' => 0, 'watchlisthidepatrolled' => 0, - 'watchlisthidecategorization' => 0, 'watchmoves' => 0, 'watchrollback' => 0, 'wllimit' => 250, @@ -6949,7 +6934,6 @@ $wgLogHeaders = array( */ $wgLogActions = array( 'protect/modify' => 'modifiedarticleprotection', - 'protect/move_prot' => 'movedarticleprotection', 'protect/protect' => 'protectedarticle', 'protect/unprotect' => 'unprotectedarticle', ); @@ -6979,6 +6963,7 @@ $wgLogActionsHandlers = array( 'move/move' => 'MoveLogFormatter', 'move/move_redir' => 'MoveLogFormatter', 'patrol/patrol' => 'PatrolLogFormatter', + 'protect/move_prot' => 'ProtectLogFormatter', 'rights/autopromote' => 'RightsLogFormatter', 'rights/rights' => 'RightsLogFormatter', 'suppress/block' => 'BlockLogFormatter', @@ -7708,6 +7693,7 @@ $wgUseLinkNamespaceDBFields = true; * $wgVirtualRestConfig['modules']['parsoid'] = array( * 'url' => 'http://localhost:8000', * 'prefix' => 'enwiki', + * 'domain' => 'en.wikipedia.org', * ); * * @var array @@ -7718,6 +7704,7 @@ $wgVirtualRestConfig = array( 'global' => array( # Timeout in seconds 'timeout' => 360, + # 'domain' is set to $wgCanonicalServer in Setup.php 'forwardCookies' => false, 'HTTPProxy' => null )