| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -338,24 +338,24 @@ |
| 339 | 339 | |
| 340 | 340 | /** Determines if a failed virus scan (AV_SCAN_FAILED) will cause the file to be rejected. |
| 341 | 341 | * @global boolean $wgAntivirusRequired |
| 342 | | -*/ |
| | 342 | + */ |
| 343 | 343 | $wgAntivirusRequired= true; |
| 344 | 344 | |
| 345 | 345 | /** Determines if the mime type of uploaded files should be checked |
| 346 | 346 | * @global boolean $wgVerifyMimeType |
| 347 | | -*/ |
| | 347 | + */ |
| 348 | 348 | $wgVerifyMimeType= true; |
| 349 | 349 | |
| 350 | 350 | /** Sets the mime type definition file to use by MimeMagic.php. |
| 351 | | -* @global string $wgMimeTypeFile |
| 352 | | -*/ |
| | 351 | + * @global string $wgMimeTypeFile |
| | 352 | + */ |
| 353 | 353 | $wgMimeTypeFile= "includes/mime.types"; |
| 354 | 354 | #$wgMimeTypeFile= "/etc/mime.types"; |
| 355 | 355 | #$wgMimeTypeFile= NULL; #use built-in defaults only. |
| 356 | 356 | |
| 357 | 357 | /** Sets the mime type info file to use by MimeMagic.php. |
| 358 | | -* @global string $wgMimeInfoFile |
| 359 | | -*/ |
| | 358 | + * @global string $wgMimeInfoFile |
| | 359 | + */ |
| 360 | 360 | $wgMimeInfoFile= "includes/mime.info"; |
| 361 | 361 | #$wgMimeInfoFile= NULL; #use built-in defaults only. |
| 362 | 362 | |
| — | — | @@ -363,21 +363,21 @@ |
| 364 | 364 | * This should be used only if fileinfo is installed as a shared object |
| 365 | 365 | * or a dynamic libary |
| 366 | 366 | * @global string $wgLoadFileinfoExtension |
| 367 | | -*/ |
| | 367 | + */ |
| 368 | 368 | $wgLoadFileinfoExtension= false; |
| 369 | 369 | |
| 370 | 370 | /** Sets an external mime detector program. The command must print only |
| 371 | 371 | * the mime type to standard output. |
| 372 | 372 | * The name of the file to process will be appended to the command given here. |
| 373 | 373 | * If not set or NULL, mime_content_type will be used if available. |
| 374 | | -*/ |
| | 374 | + */ |
| 375 | 375 | $wgMimeDetectorCommand= NULL; # use internal mime_content_type function, available since php 4.3.0 |
| 376 | 376 | #$wgMimeDetectorCommand= "file -bi"; #use external mime detector (Linux) |
| 377 | 377 | |
| 378 | 378 | /** Switch for trivial mime detection. Used by thumb.php to disable all fance |
| 379 | 379 | * things, because only a few types of images are needed and file extensions |
| 380 | 380 | * can be trusted. |
| 381 | | -*/ |
| | 381 | + */ |
| 382 | 382 | $wgTrivialMimeDetection= false; |
| 383 | 383 | |
| 384 | 384 | /** |
| — | — | @@ -430,7 +430,7 @@ |
| 431 | 431 | * Useful if you want to use a shared repository by default |
| 432 | 432 | * without disabling local uploads (use $wgEnableUploads = false for that) |
| 433 | 433 | * e.g. $wgUploadNavigationUrl = 'http://commons.wikimedia.org/wiki/Special:Upload'; |
| 434 | | -*/ |
| | 434 | + */ |
| 435 | 435 | $wgUploadNavigationUrl = false; |
| 436 | 436 | |
| 437 | 437 | /** |
| — | — | @@ -856,13 +856,14 @@ |
| 857 | 857 | $wgZhdaemonHost="localhost"; |
| 858 | 858 | $wgZhdaemonPort=2004; |
| 859 | 859 | |
| 860 | | -/** Normally you can ignore this and it will be something |
| 861 | | - like $wgMetaNamespace . "_talk". In some languages, you |
| 862 | | - may want to set this manually for grammatical reasons. |
| 863 | | - It is currently only respected by those languages |
| 864 | | - where it might be relevant and where no automatic |
| 865 | | - grammar converter exists. |
| 866 | | -*/ |
| | 860 | +/** |
| | 861 | + * Normally you can ignore this and it will be something |
| | 862 | + * like $wgMetaNamespace . "_talk". In some languages, you |
| | 863 | + * may want to set this manually for grammatical reasons. |
| | 864 | + * It is currently only respected by those languages |
| | 865 | + * where it might be relevant and where no automatic |
| | 866 | + * grammar converter exists. |
| | 867 | + */ |
| 867 | 868 | $wgMetaNamespaceTalk = false; |
| 868 | 869 | |
| 869 | 870 | # Miscellaneous configuration settings |
| — | — | @@ -886,7 +887,7 @@ |
| 887 | 888 | 2 - wiki and global levels |
| 888 | 889 | 3 - site levels |
| 889 | 890 | $wgInterwikiFallbackSite - if unable to resolve from cache |
| 890 | | -*/ |
| | 891 | + */ |
| 891 | 892 | $wgInterwikiCache = false; |
| 892 | 893 | $wgInterwikiScopes = 3; |
| 893 | 894 | $wgInterwikiFallbackSite = 'wiki'; |
| — | — | @@ -1027,7 +1028,7 @@ |
| 1028 | 1029 | * |
| 1029 | 1030 | * Retroactively changing this variable will not affect |
| 1030 | 1031 | * the existing count (cf. maintenance/recount.sql). |
| 1031 | | -*/ |
| | 1032 | + */ |
| 1032 | 1033 | $wgUseCommaCount = false; |
| 1033 | 1034 | |
| 1034 | 1035 | /**#@-*/ |
| — | — | @@ -1038,7 +1039,7 @@ |
| 1039 | 1040 | * updated on every hit, any higher value n cause them to update *on average* |
| 1040 | 1041 | * every n hits. Should be set to either 1 or something largish, eg 1000, for |
| 1041 | 1042 | * maximum efficiency. |
| 1042 | | -*/ |
| | 1043 | + */ |
| 1043 | 1044 | $wgHitcounterUpdateFreq = 1; |
| 1044 | 1045 | |
| 1045 | 1046 | # Basic user rights and block settings |
| — | — | @@ -1214,11 +1215,11 @@ |
| 1215 | 1216 | $wgNamespaceProtection[ NS_MEDIAWIKI ] = array( 'editinterface' ); |
| 1216 | 1217 | |
| 1217 | 1218 | /** |
| 1218 | | -* Pages in namespaces in this array can not be used as templates. |
| 1219 | | -* Elements must be numeric namespace ids. |
| 1220 | | -* Among other things, this may be useful to enforce read-restrictions |
| 1221 | | -* which may otherwise be bypassed by using the template machanism. |
| 1222 | | -*/ |
| | 1219 | + * Pages in namespaces in this array can not be used as templates. |
| | 1220 | + * Elements must be numeric namespace ids. |
| | 1221 | + * Among other things, this may be useful to enforce read-restrictions |
| | 1222 | + * which may otherwise be bypassed by using the template machanism. |
| | 1223 | + */ |
| 1223 | 1224 | $wgNonincludableNamespaces = array(); |
| 1224 | 1225 | |
| 1225 | 1226 | /** |
| — | — | @@ -2725,15 +2726,15 @@ |
| 2726 | 2727 | $wgRevisionCacheExpiry = 0; |
| 2727 | 2728 | |
| 2728 | 2729 | /** |
| 2729 | | -* list of trusted media-types and mime types. |
| 2730 | | -* Use the MEDIATYPE_xxx constants to represent media types. |
| 2731 | | -* This list is used by Image::isSafeFile |
| 2732 | | -* |
| 2733 | | -* Types not listed here will have a warning about unsafe content |
| 2734 | | -* displayed on the images description page. It would also be possible |
| 2735 | | -* to use this for further restrictions, like disabling direct |
| 2736 | | -* [[media:...]] links for non-trusted formats. |
| 2737 | | -*/ |
| | 2730 | + * list of trusted media-types and mime types. |
| | 2731 | + * Use the MEDIATYPE_xxx constants to represent media types. |
| | 2732 | + * This list is used by Image::isSafeFile |
| | 2733 | + * |
| | 2734 | + * Types not listed here will have a warning about unsafe content |
| | 2735 | + * displayed on the images description page. It would also be possible |
| | 2736 | + * to use this for further restrictions, like disabling direct |
| | 2737 | + * [[media:...]] links for non-trusted formats. |
| | 2738 | + */ |
| 2738 | 2739 | $wgTrustedMediaFormats= array( |
| 2739 | 2740 | MEDIATYPE_BITMAP, //all bitmap formats |
| 2740 | 2741 | MEDIATYPE_AUDIO, //all audio formats |
| — | — | @@ -3033,7 +3034,7 @@ |
| 3034 | 3035 | $wgMaxRedirectLinksRetrieved = 500; |
| 3035 | 3036 | |
| 3036 | 3037 | /** |
| 3037 | | -* Maximum number of calls to expensive parser functions |
| 3038 | | -* such as PAGESINCATEGORY. |
| 3039 | | -*/ |
| | 3038 | + * Maximum number of calls to expensive parser functions |
| | 3039 | + * such as PAGESINCATEGORY. |
| | 3040 | + */ |
| 3040 | 3041 | $wgExpensiveParserFunctionLimit = 100; |