| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -165,10 +165,10 @@ |
| 166 | 166 | /**@}*/ |
| 167 | 167 | |
| 168 | 168 | /** |
| 169 | | - * Directory for caching data in the local filesystem. Should not be accessible |
| | 169 | + * Directory for caching data in the local filesystem. Should not be accessible |
| 170 | 170 | * from the web. Set this to false to not use any local caches. |
| 171 | 171 | * |
| 172 | | - * Note: if multiple wikis share the same localisation cache directory, they |
| | 172 | + * Note: if multiple wikis share the same localisation cache directory, they |
| 173 | 173 | * must all have the same set of extensions. You can set a directory just for |
| 174 | 174 | * the localisation cache using $wgLocalisationCacheConf['storeDirectory']. |
| 175 | 175 | */ |
| — | — | @@ -504,7 +504,7 @@ |
| 505 | 505 | * |
| 506 | 506 | * Please specify the namespace, as in the example below. |
| 507 | 507 | */ |
| 508 | | -$wgRepositoryBaseUrl = "http://commons.wikimedia.org/wiki/File:"; |
| | 508 | +$wgRepositoryBaseUrl = "http://commons.wikimedia.org/wiki/Image:"; |
| 509 | 509 | |
| 510 | 510 | # |
| 511 | 511 | # Email settings |
| — | — | @@ -786,15 +786,18 @@ |
| 787 | 787 | /**@}*/ |
| 788 | 788 | |
| 789 | 789 | /** |
| 790 | | - * Directory for local copy of message cache, for use in addition to memcached |
| | 790 | + * Set this to true to make a local copy of the message cache, for use in |
| | 791 | + * addition to memcached. The files will be put in $wgCacheDirectory. |
| 791 | 792 | */ |
| 792 | | -$wgLocalMessageCache = false; |
| | 793 | +$wgUseLocalMessageCache = false; |
| | 794 | + |
| 793 | 795 | /** |
| 794 | 796 | * Defines format of local cache |
| 795 | 797 | * true - Serialized object |
| 796 | 798 | * false - PHP source file (Warning - security risk) |
| 797 | 799 | */ |
| 798 | 800 | $wgLocalMessageCacheSerialized = true; |
| | 801 | + |
| 799 | 802 | /** |
| 800 | 803 | * Localisation cache configuration. Associative array with keys: |
| 801 | 804 | * class: The class to use. May be overridden by extensions. |
| — | — | @@ -891,6 +894,15 @@ |
| 892 | 895 | $wgDTD = 'http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd'; |
| 893 | 896 | $wgXhtmlDefaultNamespace = 'http://www.w3.org/1999/xhtml'; |
| 894 | 897 | |
| | 898 | + /** |
| | 899 | + * Should we output an HTML 5 doctype? This mode is still experimental, but |
| | 900 | + * all indications are that it should be usable, so it's enabled by default. |
| | 901 | + * If all goes well, it will be removed and become always true before the 1.16 |
| | 902 | + * release. |
| | 903 | + */ |
| | 904 | + $wgHtml5 = true; |
| | 905 | + |
| | 906 | + |
| 895 | 907 | /** |
| 896 | 908 | * Permit other namespaces in addition to the w3.org default. |
| 897 | 909 | * Use the prefix for the key and the namespace for the value. For |
| — | — | @@ -1456,6 +1468,7 @@ |
| 1457 | 1469 | * array( APCOND_ISIP, ip ), *OR* |
| 1458 | 1470 | * array( APCOND_IPINRANGE, range ), *OR* |
| 1459 | 1471 | * array( APCOND_AGE_FROM_EDIT, seconds since first edit ), *OR* |
| | 1472 | + * array( APCOND_BLOCKED ), *OR* |
| 1460 | 1473 | * similar constructs defined by extensions. |
| 1461 | 1474 | * |
| 1462 | 1475 | * If $wgEmailAuthentication is off, APCOND_EMAILCONFIRMED will be true for any |
| — | — | @@ -1566,7 +1579,7 @@ |
| 1567 | 1580 | $wgUseFileCache = false; |
| 1568 | 1581 | |
| 1569 | 1582 | /** Directory where the cached page will be saved */ |
| 1570 | | -$wgFileCacheDirectory = false; ///< defaults to "{$wgUploadDirectory}/cache"; |
| | 1583 | +$wgFileCacheDirectory = false; ///< defaults to "$wgCacheDirectory/html"; |
| 1571 | 1584 | |
| 1572 | 1585 | /** |
| 1573 | 1586 | * When using the file cache, we can store the cached HTML gzipped to save disk |
| — | — | @@ -2080,9 +2093,9 @@ |
| 2081 | 2094 | /** |
| 2082 | 2095 | * Site notice shown at the top of each page |
| 2083 | 2096 | * |
| 2084 | | - * This message can contain wiki text, and can also be set through the |
| 2085 | | - * MediaWiki:Sitenotice page. You can also provide a separate message for |
| 2086 | | - * logged-out users using the MediaWiki:Anonnotice page. |
| | 2097 | + * MediaWiki:Sitenotice page, which will override this. You can also |
| | 2098 | + * provide a separate message for logged-out users using the |
| | 2099 | + * MediaWiki:Anonnotice page. |
| 2087 | 2100 | */ |
| 2088 | 2101 | $wgSiteNotice = ''; |
| 2089 | 2102 | |
| — | — | @@ -2177,6 +2190,17 @@ |
| 2178 | 2191 | */ |
| 2179 | 2192 | $wgMaxAnimatedGifArea = 1.0e6; |
| 2180 | 2193 | /** |
| | 2194 | + * Browsers don't support TIFF inline generally... |
| | 2195 | + * For inline display, we need to convert to PNG or JPEG. |
| | 2196 | + * Note scaling should work with ImageMagick, but may not with GD scaling. |
| | 2197 | + * // PNG is lossless, but inefficient for photos |
| | 2198 | + * $wgTiffThumbnailType = array( 'png', 'image/png' ); |
| | 2199 | + * // JPEG is good for photos, but has no transparency support. Bad for diagrams. |
| | 2200 | + * $wgTiffThumbnailType = array( 'jpg', 'image/jpeg' ); |
| | 2201 | + */ |
| | 2202 | + $wgTiffThumbnailType = false; |
| | 2203 | + |
| | 2204 | +/** |
| 2181 | 2205 | * If rendered thumbnail files are older than this timestamp, they |
| 2182 | 2206 | * will be rerendered on demand as if the file didn't already exist. |
| 2183 | 2207 | * Update if there is some need to force thumbs and SVG rasterizations |
| — | — | @@ -2206,6 +2230,11 @@ |
| 2207 | 2231 | */ |
| 2208 | 2232 | $wgGenerateThumbnailOnParse = true; |
| 2209 | 2233 | |
| | 2234 | +/** |
| | 2235 | +* Show thumbnails for old images on the image description page |
| | 2236 | +*/ |
| | 2237 | +$wgShowArchiveThumbnails = true; |
| | 2238 | + |
| 2210 | 2239 | /** Obsolete, always true, kept for compatibility with extensions */ |
| 2211 | 2240 | $wgUseImageResize = true; |
| 2212 | 2241 | |
| — | — | @@ -2228,7 +2257,7 @@ |
| 2229 | 2258 | /** |
| 2230 | 2259 | * Recentchanges items are periodically purged; entries older than this many |
| 2231 | 2260 | * seconds will go. |
| 2232 | | - * Default: 13 weeks = about three monts |
| | 2261 | + * Default: 13 weeks = about three months |
| 2233 | 2262 | */ |
| 2234 | 2263 | $wgRCMaxAge = 13 * 7 * 24 * 3600; |
| 2235 | 2264 | |
| — | — | @@ -2375,6 +2404,9 @@ |
| 2376 | 2405 | */ |
| 2377 | 2406 | $wgExportMaxHistory = 0; |
| 2378 | 2407 | |
| | 2408 | +/** |
| | 2409 | +* Return distinct author list (when not returning full history) |
| | 2410 | +*/ |
| 2379 | 2411 | $wgExportAllowListContributors = false ; |
| 2380 | 2412 | |
| 2381 | 2413 | /** |
| — | — | @@ -2383,21 +2415,33 @@ |
| 2384 | 2416 | * pages linked to from the pages you specify. Since this number |
| 2385 | 2417 | * can become *insanely large* and could easily break your wiki, |
| 2386 | 2418 | * it's disabled by default for now. |
| | 2419 | + * |
| | 2420 | + * There's a HARD CODED limit of 5 levels of recursion to prevent a |
| | 2421 | + * crazy-big export from being done by someone setting the depth |
| | 2422 | + * number too high. In other words, last resort safety net. |
| 2387 | 2423 | */ |
| 2388 | 2424 | $wgExportMaxLinkDepth = 0; |
| 2389 | 2425 | |
| | 2426 | +/** |
| | 2427 | +* Whether to allow the "export all pages in namespace" option |
| | 2428 | +*/ |
| | 2429 | +$wgExportFromNamespaces = false; |
| 2390 | 2430 | |
| 2391 | 2431 | /** |
| 2392 | | - * Edits matching these regular expressions in body text or edit summary |
| | 2432 | + * Edits matching these regular expressions in body text |
| 2393 | 2433 | * will be recognised as spam and rejected automatically. |
| 2394 | 2434 | * |
| 2395 | 2435 | * There's no administrator override on-wiki, so be careful what you set. :) |
| 2396 | 2436 | * May be an array of regexes or a single string for backwards compatibility. |
| 2397 | 2437 | * |
| 2398 | 2438 | * See http://en.wikipedia.org/wiki/Regular_expression |
| | 2439 | + * Note that each regex needs a beginning/end delimiter, eg: # or / |
| 2399 | 2440 | */ |
| 2400 | 2441 | $wgSpamRegex = array(); |
| 2401 | 2442 | |
| | 2443 | +/** Same as the above except for edit summaries */ |
| | 2444 | +$wgSummarySpamRegex = array(); |
| | 2445 | + |
| 2402 | 2446 | /** Similarly you can get a function to do the job. The function will be given |
| 2403 | 2447 | * the following args: |
| 2404 | 2448 | * - a Title object for the article the edit is made on |
| — | — | @@ -2589,11 +2633,16 @@ |
| 2590 | 2634 | $wgSkinExtensionFunctions = array(); |
| 2591 | 2635 | |
| 2592 | 2636 | /** |
| 2593 | | - * Extension messages files |
| 2594 | | - * Associative array mapping extension name to the filename where messages can be found. |
| 2595 | | - * The file must create a variable called $messages. |
| 2596 | | - * When the messages are needed, the extension should call wfLoadExtensionMessages(). |
| | 2637 | + * Extension messages files. |
| 2597 | 2638 | * |
| | 2639 | + * Associative array mapping extension name to the filename where messages can be |
| | 2640 | + * found. The file should contain variable assignments. Any of the variables |
| | 2641 | + * present in languages/messages/MessagesEn.php may be defined, but $messages |
| | 2642 | + * is the most common. |
| | 2643 | + * |
| | 2644 | + * Variables defined in extensions will override conflicting variables defined |
| | 2645 | + * in the core. |
| | 2646 | + * |
| 2598 | 2647 | * Example: |
| 2599 | 2648 | * $wgExtensionMessagesFiles['ConfirmEdit'] = dirname(__FILE__).'/ConfirmEdit.i18n.php'; |
| 2600 | 2649 | * |
| — | — | @@ -2602,13 +2651,7 @@ |
| 2603 | 2652 | |
| 2604 | 2653 | /** |
| 2605 | 2654 | * Aliases for special pages provided by extensions. |
| 2606 | | - * Associative array mapping special page to array of aliases. First alternative |
| 2607 | | - * for each special page will be used as the normalised name for it. English |
| 2608 | | - * aliases will be added to the end of the list so that they always work. The |
| 2609 | | - * file must define a variable $aliases. |
| 2610 | | - * |
| 2611 | | - * Example: |
| 2612 | | - * $wgExtensionAliasesFiles['Translate'] = dirname(__FILE__).'/Translate.alias.php'; |
| | 2655 | + * @deprecated Use $specialPageAliases in a file referred to by $wgExtensionMessagesFiles |
| 2613 | 2656 | */ |
| 2614 | 2657 | $wgExtensionAliasesFiles = array(); |
| 2615 | 2658 | |
| — | — | @@ -2704,6 +2747,7 @@ |
| 2705 | 2748 | * $wgExtensionCredits[$type][] = array( |
| 2706 | 2749 | * 'name' => 'Example extension', |
| 2707 | 2750 | * 'version' => 1.9, |
| | 2751 | + * 'path' => __FILE__, |
| 2708 | 2752 | * 'svn-revision' => '$LastChangedRevision$', |
| 2709 | 2753 | * 'author' => 'Foo Barstein', |
| 2710 | 2754 | * 'url' => 'http://wwww.example.com/Example%20Extension/', |
| — | — | @@ -3061,7 +3105,7 @@ |
| 3062 | 3106 | 'import' => 'importlogpage', |
| 3063 | 3107 | 'patrol' => 'patrol-log-page', |
| 3064 | 3108 | 'merge' => 'mergelog', |
| 3065 | | - 'suppress' => 'suppressionlog' |
| | 3109 | + 'suppress' => 'suppressionlog', |
| 3066 | 3110 | ); |
| 3067 | 3111 | |
| 3068 | 3112 | /** |
| — | — | @@ -3178,6 +3222,7 @@ |
| 3179 | 3223 | 'Filepath' => 'media', |
| 3180 | 3224 | |
| 3181 | 3225 | 'Listusers' => 'users', |
| | 3226 | + 'Activeusers' => 'users', |
| 3182 | 3227 | 'Listgrouprights' => 'users', |
| 3183 | 3228 | 'Ipblocklist' => 'users', |
| 3184 | 3229 | 'Contributions' => 'users', |
| — | — | @@ -3813,6 +3858,12 @@ |
| 3814 | 3859 | $wgLinkHolderBatchSize = 1000; |
| 3815 | 3860 | |
| 3816 | 3861 | /** |
| | 3862 | + * By default MediaWiki does not register links pointing to same server in externallinks dataset, |
| | 3863 | + * use this value to override: |
| | 3864 | + */ |
| | 3865 | +$wgRegisterInternalExternals = false; |
| | 3866 | + |
| | 3867 | +/** |
| 3817 | 3868 | * Hooks that are used for outputting exceptions. Format is: |
| 3818 | 3869 | * $wgExceptionHooks[] = $funcname |
| 3819 | 3870 | * or: |
| — | — | @@ -3919,6 +3970,13 @@ |
| 3920 | 3971 | $wgUseTwoButtonsSearchForm = true; |
| 3921 | 3972 | |
| 3922 | 3973 | /** |
| | 3974 | + * Search form behavior for Vector skin only |
| | 3975 | + * true = use an icon search button |
| | 3976 | + * false = use Go & Search buttons |
| | 3977 | + */ |
| | 3978 | +$wgVectorUseSimpleSearch = false; |
| | 3979 | + |
| | 3980 | +/** |
| 3923 | 3981 | * Preprocessor caching threshold |
| 3924 | 3982 | */ |
| 3925 | 3983 | $wgPreprocessorCacheThreshold = 1000; |
| — | — | @@ -3952,3 +4010,19 @@ |
| 3953 | 4011 | * modify the user rights of those users via Special:UserRights |
| 3954 | 4012 | */ |
| 3955 | 4013 | $wgUserrightsInterwikiDelimiter = '@'; |
| | 4014 | + |
| | 4015 | +/** |
| | 4016 | + * Configuration for processing pool control, for use in high-traffic wikis. |
| | 4017 | + * An implementation is provided in the PoolCounter extension. |
| | 4018 | + * |
| | 4019 | + * This configuration array maps pool types to an associative array. The only |
| | 4020 | + * defined key in the associative array is "class", which gives the class name. |
| | 4021 | + * The remaining elements are passed through to the class as constructor |
| | 4022 | + * parameters. Example: |
| | 4023 | + * |
| | 4024 | + * $wgPoolCounterConf = array( 'Article::view' => array( |
| | 4025 | + * 'class' => 'PoolCounter_Client', |
| | 4026 | + * ... any extension-specific options... |
| | 4027 | + * ); |
| | 4028 | + */ |
| | 4029 | +$wgPoolCounterConf = null; |