X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FDefaultSettings.php;h=36daef4b1d6cab23bf3e1a37d0fafb3f86edb67a;hb=81e9b02ff51bfe86a8da159c7ad3c0f16977e0c8;hp=7dd3b6911d729a77e4b8aac68763d8b9a0d682ca;hpb=0022d5ba4def810373fdfbf5a36b3c9b878de20b;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index 7dd3b6911d..36daef4b1d 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -34,7 +34,7 @@ if ( !defined( 'MW_PHP4' ) ) { /** @endcond */ /** MediaWiki version number */ -$wgVersion = '1.17alpha'; +$wgVersion = '1.18alpha'; /** Name of the site. It must be changed in LocalSettings.php */ $wgSitename = 'MediaWiki'; @@ -54,7 +54,12 @@ $wgSitename = 'MediaWiki'; $wgServer = ''; /** @cond file_level_code */ -if( isset( $_SERVER['SERVER_NAME'] ) ) { +if( isset( $_SERVER['SERVER_NAME'] ) + # additionially, for requests made directly to an IPv6 address we have + # to make sure the server enclose it in either [] or nothing at all + && (strpos($_SERVER['SERVER_NAME'], '[') + xor strpos( $_SERVER['SERVER_NAME'], ']')) + ) { $serverName = $_SERVER['SERVER_NAME']; } elseif( isset( $_SERVER['HOSTNAME'] ) ) { $serverName = $_SERVER['HOSTNAME']; @@ -373,8 +378,12 @@ $wgImgAuthPublicTest = true; * - apibase Use for the foreign API's URL * - apiThumbCacheExpiry How long to locally cache thumbs for * - * The default is to initialise these arrays from the MW<1.11 backwards compatible settings: - * $wgUploadPath, $wgThumbnailScriptPath, $wgSharedUploadDirectory, etc. + * If you leave $wgLocalFileRepo set to false, Setup will fill in appropriate values. + * Otherwise, set $wgLocalFileRepo to a repository structure as described above. + * If you set $wgUseInstantCommons to true, it will add an entry for Commons. + * If you set $wgForeignFileRepos to an array of repostory structures, those will + * be searched after the local file repo. + * Otherwise, you will only have access to local media files. */ $wgLocalFileRepo = false; @@ -434,12 +443,24 @@ $wgCacheSharedUploads = true; $wgAllowCopyUploads = false; /** * Allow asynchronous copy uploads. - * This feature is experimental. + * This feature is experimental is broken as of r81612. */ $wgAllowAsyncCopyUploads = false; /** - * Max size for uploads, in bytes. Applies to all uploads. + * Max size for uploads, in bytes. If not set to an array, applies to all + * uploads. If set to an array, per upload type maximums can be set, using the + * file and url keys. If the * key is set this value will be used as maximum + * for non-specified types. + * + * For example: + * $wgMaxUploadSize = array( + * '*' => 250 * 1024, + * 'url' => 500 * 1024, + * ); + * Sets the maximum for all uploads to 250 kB except for upload-by-url, which + * will have a maximum of 500 kB. + * */ $wgMaxUploadSize = 1024*1024*100; # 100MB @@ -536,14 +557,15 @@ $wgMimeTypeBlacklist = array( 'text/scriptlet', 'application/x-msdownload', # Windows metafile, client-side vulnerability on some systems 'application/x-msmetafile', - # A ZIP file may be a valid Java archive containing an applet which exploits the - # same-origin policy to steal cookies - 'application/zip', - # MS Office OpenXML and other Open Package Conventions files are zip files - # and thus blacklisted just as other zip files - 'application/x-opc+zip', ); +/** + * Allow Java archive uploads. + * This is not recommended for public wikis since a maliciously-constructed + * applet running on the same domain as the wiki can steal the user's cookies. + */ +$wgAllowJavaUploads = false; + /** * This is a flag to determine whether or not to check file extensions on upload. * @@ -643,6 +665,8 @@ $wgCustomConvertCommand = false; * necessary to rasterize SVGs to PNG as a fallback format. * * An external program is required to perform this conversion. + * If set to an array, the first item is a PHP callable and any further items + * are passed as parameters after $srcPath, $dstPath, $width, $height */ $wgSVGConverters = array( 'ImageMagick' => '$path/convert -background white -thumbnail $widthx$height\! $input PNG:$output', @@ -651,6 +675,7 @@ $wgSVGConverters = array( 'batik' => 'java -Djava.awt.headless=true -jar $path/batik-rasterizer.jar -w $width -d $output $input', 'rsvg' => '$path/rsvg -w$width -h$height $input $output', 'imgserv' => '$path/imgserv-wrapper -i svg -o png -w$width $input $output', + 'ImagickExt' => array( 'SvgHandler::rasterizeImagickExt' ), ); /** Pick a converter defined in $wgSVGConverters */ $wgSVGConverter = 'ImageMagick'; @@ -658,6 +683,9 @@ $wgSVGConverter = 'ImageMagick'; $wgSVGConverterPath = ''; /** Don't scale a SVG larger than this */ $wgSVGMaxSize = 2048; +/** Don't read SVG metadata beyond this point. + * Default is 1024*256 bytes */ +$wgSVGMetadataCutoff = 262144; /** * MediaWiki will reject HTMLesque tags in uploaded files due to idiotic browsers which can't @@ -858,6 +886,9 @@ $wgXMLMimeTypes = array( 'http://www.lysator.liu.se/~alla/dia/:diagram' => 'application/x-dia-diagram', 'http://www.w3.org/1999/xhtml:html' => 'text/html', // application/xhtml+xml? 'html' => 'text/html', // application/xhtml+xml? + 'http://www.opengis.net/kml/2.1:kml' => 'application/vnd.google-earth.kml+xml', + 'http://www.opengis.net/kml/2.2:kml' => 'application/vnd.google-earth.kml+xml', + 'kml' => 'application/vnd.google-earth.kml+xml', ); /** @@ -897,7 +928,7 @@ $wgGalleryOptions = array ( 'imagesPerRow' => 0, // Default number of images per-row in the gallery. 0 -> Adapt to screensize 'imageWidth' => 120, // Width of the cells containing images in galleries (in "px") 'imageHeight' => 120, // Height of the cells containing images in galleries (in "px") - 'captionLength' => 20, // Length of caption to truncate (in characters) + 'captionLength' => 25, // Length of caption to truncate (in characters) 'showBytes' => true, // Show the filesize in bytes in categories ); @@ -1026,6 +1057,11 @@ $wgPasswordReminderResendTime = 24; */ $wgNewPasswordExpiry = 3600 * 24 * 7; +/** + * The time, in seconds, when an email confirmation email expires + */ +$wgUserEmailConfirmationTokenExpiry = 7 * 24 * 60 * 60; + /** * SMTP Mode * For using a direct (authenticated) SMTP server connection. @@ -1043,6 +1079,7 @@ $wgSMTP = false; /** * Additional email parameters, will be passed as the last argument to mail() call. + * If using safe_mode this has no effect */ $wgAdditionalMailParams = null; @@ -1167,8 +1204,6 @@ $wgSQLMode = ''; /** Mediawiki schema */ $wgDBmwschema = 'mediawiki'; -/** Tsearch2 schema */ -$wgDBts2schema = 'public'; /** To override default SQLite data directory ($docroot/../data) */ $wgSQLiteDataDir = ''; @@ -1457,6 +1492,8 @@ $wgCacheDirectory = false; * - CACHE_DBA: Use PHP's DBA extension to store in a DBM-style * database. This is slow, and is not recommended for * anything other than debugging. + * - (other): A string may be used which identifies a cache + * configuration in $wgObjectCaches. * * @see $wgMessageCacheType, $wgParserCacheType */ @@ -1478,6 +1515,36 @@ $wgMessageCacheType = CACHE_ANYTHING; */ $wgParserCacheType = CACHE_ANYTHING; +/** + * Advanced object cache configuration. + * + * Use this to define the class names and constructor parameters which are used + * for the various cache types. Custom cache types may be defined here and + * referenced from $wgMainCacheType, $wgMessageCacheType or $wgParserCacheType. + * + * The format is an associative array where the key is a cache identifier, and + * the value is an associative array of parameters. The "class" parameter is the + * class name which will be used. Alternatively, a "factory" parameter may be + * given, giving a callable function which will generate a suitable cache object. + * + * The other parameters are dependent on the class used. + */ +$wgObjectCaches = array( + CACHE_NONE => array( 'class' => 'EmptyBagOStuff' ), + CACHE_DB => array( 'class' => 'SqlBagOStuff', 'table' => 'objectcache' ), + CACHE_DBA => array( 'class' => 'DBABagOStuff' ), + + CACHE_ANYTHING => array( 'factory' => 'ObjectCache::newAnything' ), + CACHE_ACCEL => array( 'factory' => 'ObjectCache::newAccelerator' ), + CACHE_MEMCACHED => array( 'factory' => 'ObjectCache::newMemcached' ), + + 'eaccelerator' => array( 'class' => 'eAccelBagOStuff' ), + 'apc' => array( 'class' => 'APCBagOStuff' ), + 'xcache' => array( 'class' => 'XCacheBagOStuff' ), + 'wincache' => array( 'class' => 'WinCacheBagOStuff' ), + 'memcached-php' => array( 'class' => 'MemcachedPhpBagOStuff' ), +); + /** * The expiry time for the parser cache, in seconds. The default is 86.4k * seconds, otherwise known as a day. @@ -1586,7 +1653,7 @@ $wgCacheEpoch = '20030516000000'; * to ensure that client-side caches do not keep obsolete copies of global * styles. */ -$wgStyleVersion = '301'; +$wgStyleVersion = '303'; /** * This will cache static pages for non-logged-in users to reduce @@ -1670,9 +1737,9 @@ $wgClockSkewFudge = 5; * to setting $wgCacheEpoch to the modification time of LocalSettings.php, as * was previously done in the default LocalSettings.php file. * - * On high-traffic wikis, this should be set to false, to avoid the need to + * On high-traffic wikis, this should be set to false, to avoid the need to * check the file modification time, and to avoid the performance impact of - * unnecessary cache invalidations. + * unnecessary cache invalidations. */ $wgInvalidateCacheOnLocalSettingsChange = true; @@ -1709,7 +1776,7 @@ $wgUseXVO = false; * $wgInternalServer = 'http://yourinternal.tld:8000'; * */ -$wgInternalServer = $wgServer; +$wgInternalServer = false; /** * Cache timeout for the squid, will be sent as s-maxage (without ESI) or @@ -2081,28 +2148,49 @@ $wgLocalTZoffset = null; /** The default Content-Type header. */ $wgMimeType = 'text/html'; -/** The content type used in script tags. */ +/** + * The content type used in script tags. This is mostly going to be ignored if + * $wgHtml5 is true, at least for actual HTML output, since HTML5 doesn't + * require a MIME type for JavaScript or CSS (those are the default script and + * style languages). + */ $wgJsMimeType = 'text/javascript'; -/** The HTML document type. */ +/** + * The HTML document type. Ignored if $wgHtml5 is true, since + * doesn't actually have a doctype part to put this variable's contents in. + */ $wgDocType = '-//W3C//DTD XHTML 1.0 Transitional//EN'; -/** The URL of the document type declaration. */ +/** + * The URL of the document type declaration. Ignored if $wgHtml5 is true, + * since HTML5 has no DTD, and doesn't actually have a DTD part + * to put this variable's contents in. + */ $wgDTD = 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'; -/** The default xmlns attribute. */ +/** + * The default xmlns attribute. Ignored if $wgHtml5 is true (or it's supposed + * to be), since we don't currently support XHTML5, and in HTML5 (i.e., served + * as text/html) the attribute has no effect, so why bother? + */ $wgXhtmlDefaultNamespace = 'http://www.w3.org/1999/xhtml'; /** * Should we output an HTML5 doctype? If false, use XHTML 1.0 Transitional * instead, and disable HTML5 features. This may eventually be removed and set - * to always true. + * to always true. If it's true, a number of other settings will be irrelevant + * and have no effect. */ $wgHtml5 = true; /** * Defines the value of the version attribute in the <html> tag, if any. - * Will be initialized later if not set explicitly. + * This is ignored if $wgHtml5 is false. If $wgAllowRdfaAttributes and + * $wgHtml5 are both true, and this evaluates to boolean false (like if it's + * left at the default null value), it will be auto-initialized to the correct + * value for RDFa+HTML5. As such, you should have no reason to ever actually + * set this to anything. */ $wgHtml5Version = null; @@ -2142,6 +2230,9 @@ $wgWellFormedXml = true; * $wgXhtmlNamespaces['svg'] = 'http://www.w3.org/2000/svg'; * Normally we wouldn't have to define this in the root * element, but IE needs it there in some circumstances. + * + * This is ignored if $wgHtml5 is true, for the same reason as + * $wgXhtmlDefaultNamespace. */ $wgXhtmlNamespaces = array(); @@ -2260,11 +2351,32 @@ $wgUseSiteCss = true; $wgEnableTooltipsAndAccesskeys = true; /** - * Break out of framesets. This can be used to prevent external sites from - * framing your site with ads. + * Break out of framesets. This can be used to prevent clickjacking attacks, + * or to prevent external sites from framing your site with ads. */ $wgBreakFrames = false; +/** + * The X-Frame-Options header to send on pages sensitive to clickjacking + * attacks, such as edit pages. This prevents those pages from being displayed + * in a frame or iframe. The options are: + * + * - 'DENY': Do not allow framing. This is recommended for most wikis. + * + * - 'SAMEORIGIN': Allow framing by pages on the same domain. This can be used + * to allow framing within a trusted domain. This is insecure if there + * is a page on the same domain which allows framing of arbitrary URLs. + * + * - false: Allow all framing. This opens up the wiki to XSS attacks and thus + * full compromise of local user accounts. Private wikis behind a + * corporate firewall are especially vulnerable. This is not + * recommended. + * + * For extra safety, set $wgBreakFrames = true, to prevent framing on all pages, + * not just edit pages. + */ +$wgEditPageFrameOptions = 'DENY'; + /** * Disable output compression (enabled by default if zlib is available) */ @@ -2275,28 +2387,29 @@ $wgDisableOutputCompression = false; * 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. * - * Currently this appears to work fine in Chrome 4 and 5, Firefox 3.5 and 3.6, IE6 - * and 8, and Opera 10.50, but it fails in Opera 10.10: Unicode IDs don't seem - * to work as anchors. So not quite ready for general use yet. + * Currently this appears to work fine in all browsers, but it's disabled by + * default because it normalizes id's a bit too aggressively, breaking preexisting + * content (particularly Cite). See bug 27733, bug 27694, bug 27474. */ -$wgExperimentalHtmlIds = true; +$wgExperimentalHtmlIds = false; /** * Abstract list of footer icons for skins in place of old copyrightico and poweredbyico code * You can add new icons to the built in copyright or poweredby, or you can create * a new block. Though note that you may need to add some custom css to get good styling * of new blocks in monobook. vector and modern should work without any special css. - * + * * $wgFooterIcons itself is a key/value array. - * The key os the name of a block that the icons will be wrapped in. - * The final id varries by skin; Monobook and Vector will turn poweredby into f-poweredbyico - * while Modern turns it into mw_poweredby. - * The value is a key/value array of icons. The key may or may not be used by the - * skin but it can be used to find the icon and unset it or change the icon if needed. + * The key is the name of a block that the icons will be wrapped in. The final id varies + * by skin; Monobook and Vector will turn poweredby into f-poweredbyico while Modern + * turns it into mw_poweredby. + * The value is either key/value array of icons or a string. + * In the key/value array the key may or may not be used by the skin but it can + * be used to find the icon and unset it or change the icon if needed. * This is useful for disabling icons that are set by extensions. - * The value should be either a string or an array. - * If it is a string it will be output directly, however some skins may choose to ignore it. - * An array is the preferred format for the icon, the following keys are used: + * The value should be either a string or an array. If it is a string it will be output + * directly as html, however some skins may choose to ignore it. An array is the preferred format + * for the icon, the following keys are used: * src: An absolute url to the image to use for the icon, this is recommended * but not required, however some skins will ignore icons without an image * url: The url to use in the arround the text or icon, if not set an will not be outputted @@ -2320,6 +2433,13 @@ $wgFooterIcons = array( ), ); +/** + * Login / create account link behavior when it's possible for anonymous users to create an account + * true = use a combined login / create account link + * false = split login and create account into two separate links + */ +$wgUseCombinedLoginLink = true; + /** * Search form behavior for Vector skin only * true = use an icon search button @@ -2408,6 +2528,25 @@ $wgResourceLoaderDebug = false; */ $wgResourceLoaderUseESI = false; +/** + * Put each statement on its own line when minifying JavaScript. This makes + * debugging in non-debug mode a bit easier. + */ +$wgResourceLoaderMinifierStatementsOnOwnLine = false; + +/** + * Maximum line length when minifying JavaScript. This is not a hard maximum: + * the minifier will try not to produce lines longer than this, but may be + * forced to do so in certain cases. + */ +$wgResourceLoaderMinifierMaxLineLength = 1000; + +/** + * Whether to include the mediawiki.legacy JS library (old wikibits.js), and its + * dependencies + */ +$wgIncludeLegacyJavaScript = true; + /** @} */ # End of resource loader settings } @@ -2875,12 +3014,6 @@ $wgMinimalPasswordLength = 1; */ $wgLivePasswordStrengthChecks = false; -/** - * List of weak passwords which shouldn't be allowed. - * The items should be in lowercase. The check is case insensitive. - */ -$wgWeakPasswords = array( 'password', 'passpass', 'passpass1' ); - /** * Maximum number of Unicode characters in signature */ @@ -3073,11 +3206,6 @@ $wgAllowPrefChange = array(); * @since 1.17 */ $wgSecureLogin = false; -/** - * Default for 'use secure login' checkbox - * @since 1.17 - */ -$wgSecureLoginStickHTTPS = false; /** @} */ # end user accounts } @@ -3086,10 +3214,16 @@ $wgSecureLoginStickHTTPS = false; * @{ */ -/** Allow sysops to ban logged-in users */ +/** + * Allow sysops to ban logged-in users + * @deprecated since 1.18 + */ $wgSysopUserBans = true; -/** Allow sysops to ban IP ranges */ +/** + * Allow sysops to ban IP ranges + * @deprecated since 1.18; set $wgBlockCIDRLimit to array( 'IPv4' => 32, 'IPv6 => 128 ) instead. + */ $wgSysopRangeBans = true; /** @@ -3231,7 +3365,6 @@ $wgGroupPermissions['sysop']['autopatrol'] = true; $wgGroupPermissions['sysop']['protect'] = true; $wgGroupPermissions['sysop']['proxyunbannable'] = true; $wgGroupPermissions['sysop']['rollback'] = true; -$wgGroupPermissions['sysop']['trackback'] = true; $wgGroupPermissions['sysop']['upload'] = true; $wgGroupPermissions['sysop']['reupload'] = true; $wgGroupPermissions['sysop']['reupload-shared'] = true; @@ -3248,6 +3381,7 @@ $wgGroupPermissions['sysop']['movefile'] = true; $wgGroupPermissions['sysop']['unblockself'] = true; $wgGroupPermissions['sysop']['suppressredirect'] = true; #$wgGroupPermissions['sysop']['mergehistory'] = true; +#$wgGroupPermissions['sysop']['trackback'] = true; // Permission to change users' group assignments $wgGroupPermissions['bureaucrat']['userrights'] = true; @@ -3322,8 +3456,10 @@ $wgGroupsRemoveFromSelf = array(); * Set of available actions that can be restricted via action=protect * You probably shouldn't change this. * Translated through restriction-* messages. + * Title::getRestrictionTypes() will remove restrictions that are not + * applicable to a specific title (create and upload) */ -$wgRestrictionTypes = array( 'edit', 'move' ); +$wgRestrictionTypes = array( 'create', 'edit', 'move', 'upload' ); /** * Rights which can be required for each protection level (via action=protect) @@ -3610,7 +3746,7 @@ $wgProxyKey = false; $wgCookieExpiration = 30*86400; /** - * Set to set an explicit domain on the login cookies eg, "justthis.domain. org" + * Set to set an explicit domain on the login cookies eg, "justthis.domain.org" * or ".any.subdomain.net" */ $wgCookieDomain = ''; @@ -3628,10 +3764,8 @@ $wgCookiePrefix = false; * Set authentication cookies to HttpOnly to prevent access by JavaScript, * in browsers that support this feature. This can mitigates some classes of * XSS attack. - * - * Only supported on PHP 5.2 or higher. */ -$wgCookieHttpOnly = version_compare("5.2", PHP_VERSION, "<"); +$wgCookieHttpOnly = true; /** * If the requesting browser matches a regex in this blacklist, we won't @@ -3733,11 +3867,6 @@ $wgDebugRawPage = false; */ $wgDebugComments = false; -/** - * Print debug output to the terminal when running command line scripts. - */ -$wgDebugToCommandLine = false; - /** * Write SQL queries to the debug log */ @@ -3854,6 +3983,14 @@ $wgDebugFunctionEntry = 0; */ $wgStatsMethod = 'cache'; +/** + * When $wgStatsMethod is 'udp', setting this to a string allows statistics to + * be aggregated over more than one wiki. The string will be used in place of + * the DB name in outgoing UDP packets. If this is set to false, the DB name + * will be used. + */ +$wgAggregateStatsID = false; + /** Whereas to count the number of time an article is viewed. * Does not work if pages are cached (for example with squid). */ @@ -3862,6 +3999,8 @@ $wgDisableCounters = false; /** * Support blog-style "trackbacks" for articles. See * http://www.sixapart.com/pronet/docs/trackback_spec for details. + * + * If enabling this, you also need to grant the 'trackback' right to a group */ $wgUseTrackbacks = false; @@ -3875,8 +4014,8 @@ $wgUseTrackbacks = false; * Use full paths. */ $wgParserTestFiles = array( - "$IP/maintenance/tests/parser/parserTests.txt", - "$IP/maintenance/tests/parser/ExtraParserTests.txt" + "$IP/tests/parser/parserTests.txt", + "$IP/tests/parser/extraParserTests.txt" ); /** @@ -3915,11 +4054,8 @@ $wgAdvancedSearchHighlighting = false; /** * Regexp to match word boundaries, defaults for non-CJK languages * should be empty for CJK since the words are not separate - * - * @todo FIXME: checks for lower than required PHP version (5.1.x). */ -$wgSearchHighlightBoundaries = version_compare("5.1", PHP_VERSION, "<")? '[\p{Z}\p{P}\p{C}]' - : '[ ,.;:!?~!@#$%\^&*\(\)+=\-\\|\[\]"\'<>\n\r\/{}]'; // PHP 5.0 workaround +$wgSearchHighlightBoundaries = '[\p{Z}\p{P}\p{C}]'; /** * Set to true to have the search engine count total @@ -4137,8 +4273,13 @@ $wgReadOnly = null; $wgReadOnlyFile = false; /** - * If this is set to some string, this opens up config/index.php for upgrades - * when needed. You will need to provide this key to use it + * When you run the web-based upgrade utility, it will tell you what to set + * this to in order to authorize the upgrade process. It will subsequently be + * used as a password, to authorize further upgrades. + * + * For security, do not set this to a guessable string. Use the value supplied + * by the install/upgrade process. To cause the upgrader to generate a new key, + * delete the old key from LocalSettings.php. */ $wgUpgradeKey = false; @@ -4310,7 +4451,10 @@ $wgRightsIcon = null; */ $wgLicenseTerms = false; -/** Set this to some HTML to override the rights icon with an arbitrary logo */ +/** + * Set this to some HTML to override the rights icon with an arbitrary logo + * @deprecated Use $wgFooterIcons['copyright']['copyright'] + */ $wgCopyrightIcon = null; /** Set this to true if you want detailed copyright information forms on Upload. */ @@ -4453,7 +4597,10 @@ $wgParserOutputHooks = array(); /** * List of valid skin names. - * The key should be the name in all lower case, the value should be a display name. + * The key should be the name in all lower case, the value should be a properly + * cased name for the skin. This value will be prefixed with "Skin" to create the + * class name of the skin to load, and if the skin's class cannot be found through + * the autoloader it will be used to load a .php file by that name in the skins directory. * The default skins will be added later, by Skin::getSkinNames(). Use * Skin::getSkinNames() as an accessor if you wish to have access to the full list. */ @@ -4495,6 +4642,7 @@ $wgExtensionCredits = array(); /** * Authentication plugin. + * @var AuthPlugin */ $wgAuth = null; @@ -4524,6 +4672,24 @@ $wgJobClasses = array( 'uploadFromUrl' => 'UploadFromUrlJob', ); +/** + * Extensions of "thumbnails" that are very expensive to regenerate and should be + * excluded from normal action=purge thumbnail removal. + */ +$wgExcludeFromThumbnailPurge = array(); + +/** + + * Jobs that must be explicitly requested, i.e. aren't run by job runners unless special flags are set. + * + * These can be: + * - Very long-running jobs. + * - Jobs that you would never want to run as part of a page rendering request. + * - Jobs that you want to run on specialized machines ( like transcoding, or a particular + * machine on your cluster has 'outside' web access you could restrict uploadFromUrl ) + */ +$wgJobTypesExcludedFromDefaultQueue = array(); + /** * Additional functions to be performed with updateSpecialPages. * Expensive Querypages are already updated. @@ -4577,13 +4743,24 @@ $wgCategoryMagicGallery = true; $wgCategoryPagingLimit = 200; /** - * A version indicator for collations that will be stored in cl_collation for - * all new rows. Used when the collation algorithm changes: a script checks - * for all rows where cl_collation != $wgCategoryCollation and regenerates - * cl_sortkey based on the page name and cl_sortkey_prefix. + * Specify how category names should be sorted, when listed on a category page. + * A sorting scheme is also known as a collation. + * + * Available values are: + * + * - uppercase: Converts the category name to upper case, and sorts by that. * - * Currently only supports 'uppercase', which just uppercases the string. This - * is a dummy collation, to be replaced later by real ones. + * - uca-default: Provides access to the Unicode Collation Algorithm with + * the default element table. This is a compromise collation which sorts + * all languages in a mediocre way. However, it is better than "uppercase". + * + * To use the uca-default collation, you must have PHP's intl extension + * installed. See http://php.net/manual/en/intl.setup.php . The details of the + * resulting collation will depend on the version of ICU installed on the + * server. + * + * After you change this, you must run maintenance/updateCollation.php to fix + * the sort keys in the database. */ $wgCategoryCollation = 'uppercase'; @@ -4738,11 +4915,6 @@ $wgLogActionsHandlers = array(); */ $wgNewUserLog = true; -/** - * Log the automatic creations of new users accounts? - */ -$wgLogAutocreatedAccounts = false; - /** @} */ # end logging } /*************************************************************************//** @@ -4811,13 +4983,14 @@ $wgSpecialPageGroups = array( 'Listusers' => 'users', 'Activeusers' => 'users', 'Listgrouprights' => 'users', - 'Ipblocklist' => 'users', + 'BlockList' => 'users', 'Contributions' => 'users', 'Emailuser' => 'users', 'Listadmins' => 'users', 'Listbots' => 'users', 'Userrights' => 'users', - 'Blockip' => 'users', + 'Block' => 'users', + 'Unblock' => 'users', 'Preferences' => 'users', 'Resetpass' => 'users', 'DeletedContributions' => 'users', @@ -5003,14 +5176,7 @@ $wgAPIMaxUncachedDiffs = 1; $wgAPIRequestLog = false; /** - * Cache the API help text for up to an hour. Disable this during API - * debugging and development - */ -$wgAPICacheHelp = true; - -/** - * Set the timeout for the API help text cache. Ignored if $wgAPICacheHelp - * is false. + * Set the timeout for the API help text cache. If set to 0, caching disabled */ $wgAPICacheHelpTimeout = 60*60; @@ -5028,7 +5194,6 @@ $wgAjaxExportList = array( 'wfAjaxGetFileUrl' ); /** * Enable watching/unwatching pages using AJAX. * Requires $wgUseAjax to be true too. - * Causes wfAjaxWatch to be added to $wgAjaxExportList */ $wgAjaxWatch = true; @@ -5174,7 +5339,9 @@ $wgDisabledActions = array(); /** * Disable redirects to special pages and interwiki redirects, which use a 302 - * and have no "redirected from" link. + * and have no "redirected from" link. Note this is only for articles with #Redirect + * in them. URL's containing a local interwiki prefix (or a non-canonical special + * page name) are still hard redirected regardless of this setting. */ $wgDisableHardRedirects = false; @@ -5237,8 +5404,8 @@ $wgUploadMaintenance = false; $wgEnableSelenium = false; $wgSeleniumTestConfigs = array(); $wgSeleniumConfigFile = null; - - +$wgDBtestuser = ''; //db user that has permission to create and drop the test databases only +$wgDBtestpassword = ''; /** * For really cool vim folding this needs to be at the end: