X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FDefaultSettings.php;h=a7e57d7699fd9fd025437c0276eb07117595fe65;hb=58227f314e7ed6dabd0b1b3d8383c2745cd2bff5;hp=6646997de0454a76f58634af7f698ebb729a74c4;hpb=4a40b9dd2756a2f8068f9b948408d1ed2557f093;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 6646997de0..a7e57d7699 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -142,16 +142,17 @@ $wgRedirectScript = false; ///< defaults to "{$wgScriptPath}/redirect{$wgScrip * splitting style sheets or images outside the main document root. */ /** - * style path as seen by users + * asset paths as seen by users */ $wgStylePath = false; ///< defaults to "{$wgScriptPath}/skins" +$wgExtensionAssetsPath = false; ///< defaults to "{$wgScriptPath}/extensions" + /** * filesystem stylesheets directory */ $wgStyleDirectory = false; ///< defaults to "{$IP}/skins" $wgStyleSheetPath = &$wgStylePath; $wgArticlePath = false; ///< default to "{$wgScript}/$1" or "{$wgScript}?title=$1", depending on $wgUsePathInfo -$wgVariantArticlePath = false; $wgUploadPath = false; ///< defaults to "{$wgScriptPath}/images" $wgUploadDirectory = false; ///< defaults to "{$IP}/images" $wgHashedUploadDirectory = true; @@ -197,7 +198,7 @@ $wgImgAuthPublicTest = true; ///< defaults to true - if public read is turned on /**@{ * File repository structures * - * $wgLocalFileRepo is a single repository structure, and $wgForeignFileRepo is + * $wgLocalFileRepo is a single repository structure, and $wgForeignFileRepos is * an array of such structures. Each repository structure is an associative * array of properties configuring the repository. * @@ -213,10 +214,10 @@ $wgImgAuthPublicTest = true; ///< defaults to true - if public read is turned on * thumbScriptUrl The URL for thumb.php (optional, not recommended) * transformVia404 Whether to skip media file transformation on parse and rely on a 404 * handler instead. - * initialCapital Equivalent to $wgCapitalLinks, determines whether filenames implicitly - * start with a capital letter. The current implementation may give incorrect - * description page links when the local $wgCapitalLinks and initialCapital - * are mismatched. + * initialCapital Equivalent to $wgCapitalLinks (or $wgCapitalLinkOverrides[NS_FILE], + * determines whether filenames implicitly start with a capital letter. + * The current implementation may give incorrect description page links + * when the local $wgCapitalLinks and initialCapital are mismatched. * pathDisclosureProtection * May be 'paranoid' to remove all parameters from error messages, 'none' to * leave the paths in unchanged, or 'simple' to replace paths with @@ -256,6 +257,13 @@ $wgLocalFileRepo = false; $wgForeignFileRepos = array(); /**@}*/ +/** + * Use Commons as a remote file repository. Essentially a wrapper, when this + * is enabled $wgForeignFileRepos will point at Commons with a set of default + * settings + */ +$wgUseInstantCommons = false; + /** * Allowed title characters -- regex character class * Don't change this unless you know what you're doing @@ -306,7 +314,7 @@ $wgUrlProtocols = array( /** internal name of virus scanner. This servers as a key to the $wgAntivirusSetup array. * Set this to NULL to disable virus scanning. If not null, every file uploaded will be scanned for viruses. */ -$wgAntivirus= NULL; +$wgAntivirus= null; /** Configuration for different virus scanners. This an associative array of associative arrays: * it contains on setup array per known scanner type. The entry is selected by $wgAntivirus, i.e. @@ -373,11 +381,11 @@ $wgVerifyMimeType= true; /** Sets the mime type definition file to use by MimeMagic.php. */ $wgMimeTypeFile= "includes/mime.types"; #$wgMimeTypeFile= "/etc/mime.types"; -#$wgMimeTypeFile= NULL; #use built-in defaults only. +#$wgMimeTypeFile= null; #use built-in defaults only. /** Sets the mime type info file to use by MimeMagic.php. */ $wgMimeInfoFile= "includes/mime.info"; -#$wgMimeInfoFile= NULL; #use built-in defaults only. +#$wgMimeInfoFile= null; #use built-in defaults only. /** Switch for loading the FileInfo extension by PECL at runtime. * This should be used only if fileinfo is installed as a shared object @@ -390,7 +398,7 @@ $wgLoadFileinfoExtension= false; * The name of the file to process will be appended to the command given here. * If not set or NULL, mime_content_type will be used if available. */ -$wgMimeDetectorCommand= NULL; # use internal mime_content_type function, available since php 4.3.0 +$wgMimeDetectorCommand= null; # use internal mime_content_type function, available since php 4.3.0 #$wgMimeDetectorCommand= "file -bi"; #use external mime detector (Linux) /** Switch for trivial mime detection. Used by thumb.php to disable all fance @@ -449,7 +457,7 @@ $wgSharedUploadDBprefix = ''; $wgCacheSharedUploads = true; /** * Allow for upload to be copied from an URL. Requires Special:Upload?source=web -* timeout for Copy Uploads is set by wgAsyncHTTPTimeout & wgSyncHTTPTimeout +* The timeout for copy uploads is set by $wgHTTPTimeout. */ $wgAllowCopyUploads = false; @@ -460,20 +468,14 @@ $wgAllowCopyUploads = false; */ $wgMaxUploadSize = 1024*1024*100; # 100MB - -/** - * Enable Firefogg support. Adds support for in-browser transcoding to Ogg - * Theora, chunked uploads for large image files and client side hash checks. - * - * Ignored unless $wgEnableJS2system is true. - */ -$wgEnableFirefogg = true; - /** * Point the upload navigation link to an external URL * Useful if you want to use a shared repository by default * without disabling local uploads (use $wgEnableUploads = false for that) * e.g. $wgUploadNavigationUrl = 'http://commons.wikimedia.org/wiki/Special:Upload'; + * + * This also affects images inline images that do not exist. In that case the URL will get + * (?|&)wpDestFile= appended to it as appropriate. */ $wgUploadNavigationUrl = false; @@ -772,6 +774,9 @@ $wgParserCacheType = CACHE_ANYTHING; $wgParserCacheExpireTime = 86400; +// Select which DBA handler to use as CACHE_DBA backend +$wgDBAhandler = 'db3'; + $wgSessionsInMemcached = false; /** This is used for setting php's session.save_handler. In practice, you will @@ -788,6 +793,7 @@ $wgUseMemCached = false; $wgMemCachedDebug = false; ///< Will be set to false in Setup.php, if the server isn't working $wgMemCachedServers = array( '127.0.0.1:11000' ); $wgMemCachedPersistent = false; +$wgMemCachedTimeout = 100000; //Data timeout in microseconds /**@}*/ /** @@ -852,11 +858,39 @@ $wgHideInterlanguageLinks = false; /** List of language names or overrides for default names in Names.php */ $wgExtraLanguageNames = array(); +/** + * List of language codes that don't correspond to an actual language. + * These codes are leftoffs from renames, or other legacy things. + * Also, qqq is a dummy "language" for documenting messages. + */ +$wgDummyLanguageCodes = array( 'qqq', 'als', 'be-x-old', 'dk', 'fiu-vro', 'iu', 'nb', 'simple', 'tp' ); + /** We speak UTF-8 all the time now, unless some oddities happen */ $wgInputEncoding = 'UTF-8'; $wgOutputEncoding = 'UTF-8'; $wgEditEncoding = ''; +/** + * Set this to true to replace Arabic presentation forms with their standard + * forms in the U+0600-U+06FF block. This only works if $wgLanguageCode is + * set to "ar". + * + * Note that pages with titles containing presentation forms will become + * inaccessible, run maintenance/cleanupTitles.php to fix this. + */ +$wgFixArabicUnicode = true; + +/** + * Set this to true to replace ZWJ-based chillu sequences in Malayalam text + * with their Unicode 5.1 equivalents. This only works if $wgLanguageCode is + * set to "ml". Note that some clients (even new clients as of 2010) do not + * support these characters. + * + * If you enable this on an existing wiki, run maintenance/cleanupTitles.php to + * fix any ZWJ sequences in existing page titles. + */ +$wgFixMalayalamUnicode = true; + /** * Locale for LC_CTYPE, to work around http://bugs.php.net/bug.php?id=45132 * For Unix-like operating systems, set this to to a locale that has a UTF-8 @@ -900,13 +934,30 @@ $wgDTD = 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'; $wgXhtmlDefaultNamespace = 'http://www.w3.org/1999/xhtml'; /** - * Should we output an HTML 5 doctype? This mode is still experimental, but + * Should we output an HTML5 doctype? This mode is still experimental, but * all indications are that it should be usable, so it's enabled by default. * If all goes well, it will be removed and become always true before the 1.16 * release. */ $wgHtml5 = true; +/** + * Defines the value of the version attribute in the <html> tag, if any. + * Will be initialized later if not set explicitly. + */ +$wgHtml5Version = null; + +/** + * Enabled RDFa attributes for use in wikitext. + * NOTE: Interaction with HTML5 is somewhat underspecified. + */ +$wgAllowRdfaAttributes = false; + +/** + * Enabled HTML5 microdata attributes for use in wikitext, if $wgHtml5 is also true. + */ +$wgAllowMicrodataAttributes = false; + /** * Should we try to make our HTML output well-formed XML? If set to false, * output will be a few bytes shorter, and the HTML will arguably be more @@ -915,7 +966,7 @@ $wgHtml5 = true; * * Setting this to false may omit quotation marks on some attributes, omit * slashes from some self-closing tags, omit some ending tags, etc., where - * permitted by HTML 5. Setting it to true will not guarantee that all pages + * permitted by HTML5. Setting it to true will not guarantee that all pages * will be well-formed, although non-well-formed pages should be rare and it's * a bug if you find one. Conversely, setting it to false doesn't mean that * all XML-y constructs will be omitted, just that they might be. @@ -997,6 +1048,22 @@ $wgDefaultLanguageVariant = false; */ $wgDisabledVariants = array(); +/** + * Like $wgArticlePath, but on multi-variant wikis, this provides a + * path format that describes which parts of the URL contain the + * language variant. For Example: + * + * $wgLanguageCode = 'sr'; + * $wgVariantArticlePath = '/$2/$1'; + * $wgArticlePath = '/wiki/$1'; + * + * A link to /wiki/ would be redirected to /sr/Главна_страна + * + * It is important that $wgArticlePath not overlap with possible values + * of $wgVariantArticlePath. + */ +$wgVariantArticlePath = false;///< defaults to false + /** * Show a bar of language selection links in the user login and user * registration forms; edit the "loginlanguagelinks" message to @@ -1134,9 +1201,6 @@ $wgDebugRawPage = false; */ $wgDebugComments = false; -/** Does nothing. Obsolete? */ -$wgLogQueries = false; - /** * Write SQL queries to the debug log */ @@ -1158,15 +1222,19 @@ $wgDebugLogGroups = array(); $wgShowDebug = false; /** - * Show the contents of $wgHooks in Special:Version + * Prefix debug messages with relative timestamp. Very-poor man's profiler. */ -$wgSpecialVersionShowHooks = false; +$wgDebugTimestamps = false; /** - * By default, only show the MediaWiki, PHP, Database versions. - * Setting this to true will try and determine versions of all helper programs. + * Print HTTP headers for every request in the debug information. */ -$wgSpecialVersionExtended = false; +$wgDebugPrintHttpHeaders = true; + +/** + * Show the contents of $wgHooks in Special:Version + */ +$wgSpecialVersionShowHooks = false; /** * Whether to show "we're sorry, but there has been a database error" pages. @@ -1249,7 +1317,7 @@ $wgSidebarCacheExpiry = 86400; * as a valid article? If $wgUseCommaCount is set to true, it will be * counted if it contains at least one comma. If it is set to false * (default), it will only be counted if it contains at least one [[wiki - * link]]. See http://meta.wikimedia.org/wiki/Help:Article_count + * link]]. See http://www.mediawiki.org/wiki/Manual:Article_count * * Retroactively changing this variable will not affect * the existing count (cf. maintenance/recount.sql). @@ -1271,6 +1339,19 @@ $wgSysopRangeBans = true; # Allow sysops to ban IP ranges $wgAutoblockExpiry = 86400; # Number of seconds before autoblock entries expire $wgBlockAllowsUTEdit = false; # Default setting for option on block form to allow self talkpage editing whilst blocked $wgSysopEmailBans = true; # Allow sysops to ban users from accessing Emailuser +$wgBlockCIDRLimit = array( + 'IPv4' => 16, # Blocks larger than a /16 (64k addresses) will not be allowed + 'IPv6' => 64, # 2^64 = ~1.8x10^19 addresses +); + +/** + * If true, blocked users will not be allowed to login. When using this with + * a public wiki, the effect of logging out blocked users may actually be + * avers: unless the user's address is also blocked (e.g. auto-block), + * logging the user out will again allow reading and editing, just as for + * anonymous visitors. + */ +$wgBlockDisablesLogin = false; # # Pages anonymous user may see as an array, e.g.: # array ( "Main Page", "Wikipedia:Help"); @@ -1605,7 +1686,7 @@ $wgCacheEpoch = '20030516000000'; * to ensure that client-side caches do not keep obsolete copies of global * styles. */ -$wgStyleVersion = '243'; +$wgStyleVersion = '265'; # Server-side caching: @@ -1877,6 +1958,13 @@ $wgSpecialPageCacheUpdates = array( $wgUseTeX = false; /** Location of the texvc binary */ $wgTexvc = './math/texvc'; +/** + * Texvc background color + * use LaTeX color format as used in \special function + * for transparent background use value 'Transparent' for alpha transparency or + * 'transparent' for binary transparency. + */ +$wgTexvcBackgroundColor = 'transparent'; /** * Normally when generating math images, we double-check that the @@ -1918,8 +2006,6 @@ $wgUDPProfilerPort = '3811'; $wgDebugProfiling = false; /** Output debug message on every wfProfileIn/wfProfileOut */ $wgDebugFunctionEntry = 0; -/** Lots of debugging output from SquidUpdate.php */ -$wgDebugSquid = false; /* * Destination for wfIncrStats() data... @@ -1952,15 +2038,16 @@ $wgSearchHighlightBoundaries = version_compare("5.1", PHP_VERSION, "<")? '[\p{Z} : '[ ,.;:!?~!@#$%\^&*\(\)+=\-\\|\[\]"\'<>\n\r\/{}]'; // PHP 5.0 workaround /** - * Set to true to have the default MySQL search engine count total + * Set to true to have the search engine count total * search matches to present in the Special:Search UI. + * Not supported by every search engine shipped with MW. * * This could however be slow on larger wikis, and is pretty flaky * with the current title vs content split. Recommend avoiding until * that's been worked out cleanly; but this may aid in testing the * search UI and API to confirm that the result count works. */ -$wgSearchMySQLTotalHits = false; +$wgCountTotalSearchHits = false; /** * Template for OpenSearch suggestions, defaults to API action=opensearch @@ -1976,9 +2063,17 @@ $wgOpenSearchTemplate = false; /** * Enable suggestions while typing in search boxes * (results are passed around in OpenSearch format) + * Requires $wgEnableOpenSearchSuggest = true; */ $wgEnableMWSuggest = false; +/** + * Enable OpenSearch suggestions requested by MediaWiki. Set this to + * false if you've disabled MWSuggest or another suggestion script and + * want reduce load caused by cached scripts pulling suggestions. + */ +$wgEnableOpenSearchSuggest = true; + /** * Template for internal MediaWiki suggestion engine, defaults to API action=opensearch * @@ -2126,6 +2221,15 @@ $wgNamespacesWithSubpages = array( NS_CATEGORY_TALK => true ); +/** + * Which namespaces have special treatment where they should be preview-on-open + * Internaly only Category: pages apply, but using this extensions (e.g. Semantic MediaWiki) + * can specify namespaces of pages they have special treatment for + */ +$wgPreviewOnOpenNamespaces = array( + NS_CATEGORY => true +); + $wgNamespacesToBeSearchedDefault = array( NS_MAIN => true, ); @@ -2398,13 +2502,13 @@ $wgEnableCreativeCommonsRdf = false; /** Override for copyright metadata. * TODO: these options need documentation */ -$wgRightsPage = NULL; -$wgRightsUrl = NULL; -$wgRightsText = NULL; -$wgRightsIcon = NULL; +$wgRightsPage = null; +$wgRightsUrl = null; +$wgRightsText = null; +$wgRightsIcon = null; /** Set this to some HTML to override the rights icon with an arbitrary logo */ -$wgCopyrightIcon = NULL; +$wgCopyrightIcon = null; /** Set this to true if you want detailed copyright information forms on Upload. */ $wgUseCopyrightUpload = false; @@ -2436,6 +2540,18 @@ $wgShowCreditsIfMax = true; */ $wgCapitalLinks = true; +/** + * @since 1.16 - This can now be set per-namespace. Some special namespaces (such + * as Special, see MWNamespace::$alwaysCapitalizedNamespaces for the full list) must be + * true by default (and setting them has no effect), due to various things that + * require them to be so. Also, since Talk namespaces need to directly mirror their + * associated content namespaces, the values for those are ignored in favor of the + * subject namespace's setting. Setting for NS_MEDIA is taken automatically from + * NS_FILE. + * EX: $wgCapitalLinkOverrides[ NS_FILE ] = false; + */ +$wgCapitalLinkOverrides = array(); + /** * List of interwiki prefixes for wikis we'll accept as sources for * Special:Import (for sysops). Since complete page history can be imported, @@ -2754,63 +2870,6 @@ $wgSpecialPages = array(); */ $wgAutoloadClasses = array(); -/* - * Array mapping JavaScript class to web path for use by the script loader. - * This is populated in AutoLoader.php. - */ -$wgJSAutoloadClasses = array(); - -/* - * boolean; if the script loader should be used to group all javascript requests. - * more about the script loader: http://www.mediawiki.org/wiki/ScriptLoader - * - * (its recommended you DO NOT enable the script loader without also enabling $wgUseFileCache - * (or have mediaWiki behind a proxy) otherwise all new js requests will result in script server js processing. - */ -$wgEnableScriptLoader = false; - -/* - * $wgScriptModifiedCheck should run a file modified check on javascript files when - * generating unique request ids for javascript include using the script-loader - * - * note this will only check core scripts that are directly included on the page. - * (not scripts loaded after the initial page display since after initial page - * display scripts inherit the unique request id) - * - * and or you can update $wgStyleVersion - */ -$wgScriptModifiedCheck = true; - -/* - * enable js2 Script System - * if enabled we include jquery, mv_embed and js2 versions of editPage.js - */ -$wgEnableJS2system = false; - -/* - * boolean; if we should minify the output. (note if you send ?debug=true in - * the page request it will automatically not group and not minify) - */ -$wgEnableScriptMinify = true; - -/* - * boolean; if we should enable javascript localization (it loads loadGM json - * call with mediaWiki msgs) - */ -$wgEnableScriptLocalization = true; - -/* - * path for mwEmbed normally js2/mwEmbed/ - */ -$wgMwEmbedDirectory = "js2/mwEmbed/"; - -/* - * Turn on debugging for the javascript script-loader & forces fresh copies - * of javascript - */ -$wgDebugJavaScript = false; - - /** * An array of extension types and inside that their names, versions, authors, * urls, descriptions and pointers to localized description msgs. Note that @@ -2873,9 +2932,6 @@ $wgMaxTocLevel = 999; /** Name of the external diff engine to use */ $wgExternalDiffEngine = false; -/** Whether to use inline diff */ -$wgEnableHtmlDiff = false; - /** Use RC Patrolling to check for vandalism */ $wgUseRCPatrol = true; @@ -2910,6 +2966,12 @@ $wgFeedDiffCutoff = 32768; */ $wgOverrideSiteFeed = array(); +/** + * Which feed types should we provide by default? This can include 'rss', + * 'atom', neither, or both. + */ +$wgAdvertisedFeedTypes = array( 'atom' ); + /** * Additional namespaces. If the namespaces defined in Language.php and * Namespace.php are insufficient, you can create new ones here, for example, @@ -2927,7 +2989,7 @@ $wgOverrideSiteFeed = array(); # 102 => "Aide", # 103 => "Discussion_Aide" # ); -$wgExtraNamespaces = NULL; +$wgExtraNamespaces = null; /** * Namespace aliases @@ -3042,10 +3104,10 @@ $wgBrowserBlackList = array( /** * Fake out the timezone that the server thinks it's in. This will be used for * date display and not for what's stored in the DB. Leave to null to retain - * your server's OS-based timezone value. This is the same as the timezone. + * your server's OS-based timezone value. * - * This variable is currently used ONLY for signature formatting, not for - * anything else. + * This variable is currently used only for signature formatting and for local + * time/date parser variables ({{LOCALTIME}} etc.) * * Timezones can be translated by editing MediaWiki messages of type * timezone-nameinlowercase like timezone-utc. @@ -3067,10 +3129,10 @@ $wgLocaltimezone = null; * $wgLocalTZoffset = date("Z") / 60; * * If your server is not configured for the timezone you want, you can set - * this in conjunction with the signature timezone and override the TZ - * environment variable like so: + * this in conjunction with the signature timezone and override the PHP default + * timezone like so: * $wgLocaltimezone="Europe/Berlin"; - * putenv("TZ=$wgLocaltimezone"); + * date_default_timezone_set( $wgLocaltimezone ); * $wgLocalTZoffset = date("Z") / 60; * * Leave at NULL to show times in universal time (UTC/GMT). @@ -3354,15 +3416,6 @@ $wgSpecialPageGroups = array( 'Booksources' => 'other', ); -/** - * Experimental preview feature to fetch rendered text - * over an XMLHttpRequest from JavaScript instead of - * forcing a submit and reload of the whole page. - * Leave disabled unless you're testing it. - * Needs JS2 ($wgEnableJS2) to be activated. - */ -$wgLivePreview = false; - /** * Disable the internal MySQL-based search, to allow it to be * implemented by an extension instead. @@ -3448,7 +3501,7 @@ $wgNamespaceRobotPolicies = array(); * 'Main_Page' => 'noindex,follow', * # "Project", not the actual project name! * 'Project:X' => 'index,follow', - * # Needs to be "Abc", not "abc" (unless $wgCapitalLinks is false)! + * # Needs to be "Abc", not "abc" (unless $wgCapitalLinks is false for that namespace)! * 'abc' => 'noindex,nofollow' * ); */ @@ -3471,7 +3524,7 @@ $wgMinimalPasswordLength = 1; /** * Activate external editor interface for files and pages - * See http://meta.wikimedia.org/wiki/Help:External_editors + * See http://www.mediawiki.org/wiki/Manual:External_editors */ $wgUseExternalEditor = true; @@ -3506,10 +3559,28 @@ $wgDisableHardRedirects = false; $wgEnableTooltipsAndAccesskeys = true; /** - * Use http.dnsbl.sorbs.net to check for open proxies + * Whether to use DNS blacklists in $wgDnsBlacklistUrls to check for open proxies + * @since 1.16 + */ +$wgEnableDnsBlacklist = false; + +/** + * @deprecated Use $wgEnableDnsBlacklist instead, only kept for backward + * compatibility */ $wgEnableSorbs = false; -$wgSorbsUrl = 'http.dnsbl.sorbs.net.'; + +/** + * List of DNS blacklists to use, if $wgEnableDnsBlacklist is true + * @since 1.16 + */ +$wgDnsBlacklistUrls = array( 'http.dnsbl.sorbs.net.' ); + +/** + * @deprecated Use $wgDnsBlacklistUrls instead, only kept for backward + * compatibility + */ +$wgSorbsUrl = array(); /** * Proxy whitelist, list of addresses that are assumed to be non-proxy despite @@ -3541,7 +3612,7 @@ $wgRateLimits = array( 'subnet' => null, ), 'mailpassword' => array( - 'anon' => NULL, + 'anon' => null, ), 'emailuser' => array( 'user' => null, @@ -3564,6 +3635,12 @@ $wgRateLimitLog = null; */ $wgRateLimitsExcludedGroups = array(); +/** + * Array of IPs which should be excluded from rate limits. + * This may be useful for whitelisting NAT gateways for conferences, etc. + */ +$wgRateLimitsExcludedIPs = array(); + /** * On Special:Unusedimages, consider images "used", if they are put * into a category. Default (false) is not to count those as used. @@ -3633,22 +3710,14 @@ $wgTrustedMediaFormats= array( $wgAllowSpecialInclusion = true; /** - * Timeout for HTTP requests done at script execution time - * default is (default php.ini script time 30s - 5s for everything else) + * Timeout for HTTP requests done internally */ -$wgSyncHTTPTimeout = 25; +$wgHTTPTimeout = 25; /** -* Timeout for asynchronous HTTP requests that run in a background PHP process -* default set to 20 min -*/ -$wgAsyncHTTPTimeout = 60*20; - -/* - * if AsyncDownload is enabled (works on unix platforms) - * fix for windows is pending. + * Timeout for Asynchronous (background) HTTP requests */ -$wgEnableAsyncDownload = false; +$wgAsyncHTTPTimeout = 25; /** * Proxy to use for CURL requests. @@ -3717,13 +3786,7 @@ $wgAjaxWatch = true; $wgAjaxUploadDestCheck = true; /** - * Enable the AJAX upload interface (needed for large http uploads & to display - * progress on uploads for browsers that support it) - */ -$wgAjaxUploadInterface = true; - -/** - * Enable previewing licences via AJAX + * Enable previewing licences via AJAX. Also requires $wgEnableAPI to be true. */ $wgAjaxLicensePreview = true; @@ -3783,8 +3846,8 @@ $wgMaxShellFileSize = 102400; $wgMaxShellTime = 180; /** -* Executable path of the PHP cli binary (php/php5). Should be set up on install. -*/ + * Executable path of the PHP cli binary (php/php5). Should be set up on install. + */ $wgPhpCli = '/usr/bin/php'; /** @@ -3998,7 +4061,7 @@ $wgExceptionHooks = array(); * Page property link table invalidation lists. When a page property * changes, this may require other link tables to be updated (eg * adding __HIDDENCAT__ means the hiddencat tracking category will - * have been added, so the categorylinks table needs to be rebuilt). + * have been added, so the categorylinks table needs to be rebuilt). * This array can be added to by extensions. */ $wgPagePropLinkInvalidations = array( @@ -4081,11 +4144,11 @@ $wgEdititis = false; $wgUniversalEditButton = true; /** - * Allow id's that don't conform to HTML4 backward compatibility requirements. - * This is currently for testing; if all goes well, this option will be removed - * and the functionality will be enabled universally. + * Should we allow a broader set of characters in id attributes, per HTML5? If + * not, use only HTML 4-compatible IDs. This option is for testing -- when the + * functionality is ready, it will be on by default with no option. */ -$wgEnforceHtmlIds = true; +$wgExperimentalHtmlIds = false; /** * Search form behavior @@ -4173,8 +4236,8 @@ $wgPoolCounterConf = null; * be specified. * * null indicates no external authentication is to be used. Otherwise, - * "ExternalUser_$wgExternalAuthType" must be the name of a non-abstract class - * that extends ExternalUser. + * $wgExternalAuthType must be the name of a non-abstract class that extends + * ExternalUser. * * Core authentication modules can be found in includes/extauth/. */ @@ -4259,20 +4322,6 @@ $wgCrossSiteAJAXdomainExceptions = array(); */ $wgMemoryLimit = "50M"; -/** - * Whether or not to use the AJAX categories system. - * Note that this requires JS2 and the script loader. - */ -$wgUseAJAXCategories = false; - -/** - * Only enable AJAXCategories on configured namespaces. Default is all. - * - * Example: - * $wgAJAXCategoriesNamespaces = array( NS_MAIN, NS_PROJECT ); - */ -$wgAJAXCategoriesNamespaces = array(); - /** * To disable file delete/restore temporarily */ @@ -4282,3 +4331,4 @@ $wgUploadMaintenance = false; * Use old names for change_tags indices. */ $wgOldChangeTagsIndex = false; +