X-Git-Url: https://git.cyclocoop.org/admin/?a=blobdiff_plain;f=includes%2FDefaultSettings.php;h=d158c1e31d81b66b488dbe8d9fad286e6ad2082b;hb=1d3fee7c596245ce78ea71c7204c3b92581ad909;hp=c1777436a982815d981111c9f752771da81dff10;hpb=6769365316abb5811410794142a21a7ddc3ab617;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index c1777436a9..d158c1e31d 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -1442,14 +1442,19 @@ $wgUseTinyRGBForJPGThumbnails = false; * Default parameters for the "" tag */ $wgGalleryOptions = [ - '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' => true, // Deprecated @since 1.28 - // Length to truncate filename to in caption when using "showfilename". - // A value of 'true' will truncate the filename to one line using CSS - // and will be the behaviour after deprecation. - 'showBytes' => true, // Show the filesize in bytes in categories + // Default number of images per-row in the gallery. 0 -> Adapt to screensize + 'imagesPerRow' => 0, + // Width of the cells containing images in galleries (in "px") + 'imageWidth' => 120, + // Height of the cells containing images in galleries (in "px") + 'imageHeight' => 120, + // Length to truncate filename to in caption when using "showfilename". + // A value of 'true' will truncate the filename to one line using CSS + // and will be the behaviour after deprecation. + // @deprecated since 1.28 + 'captionLength' => true, + // Show the filesize in bytes in categories + 'showBytes' => true, 'mode' => 'traditional', ]; @@ -2820,8 +2825,9 @@ $wgUsePrivateIPs = false; * MediaWiki out of the box. Not all languages listed there have translations, * see languages/messages/ for the list of languages with some localisation. * - * Warning: Don't use language codes listed in $wgDummyLanguageCodes like "no" - * for Norwegian (use "nb" instead), or things will break unexpectedly. + * Warning: Don't use any of MediaWiki's deprecated language codes listed in + * LanguageCode::getDeprecatedCodeMapping or $wgDummyLanguageCodes, like "no" + * for Norwegian (use "nb" instead). If you do, things will break unexpectedly. * * This defines the default interface language for all users, but users can * change it in their preferences. @@ -2880,27 +2886,32 @@ $wgExtraInterlanguageLinkPrefixes = []; $wgExtraLanguageNames = []; /** - * List of language codes that don't correspond to an actual language. - * These codes are mostly left-offs from renames, or other legacy things. - * This array makes them not appear as a selectable language on the installer, - * and excludes them when running the transstat.php script. - */ -$wgDummyLanguageCodes = [ - 'als' => 'gsw', - 'bat-smg' => 'sgs', - 'be-x-old' => 'be-tarask', - 'bh' => 'bho', - 'fiu-vro' => 'vro', - 'no' => 'nb', - 'qqq' => 'qqq', # Used for message documentation. - 'qqx' => 'qqx', # Used for viewing message keys. - 'roa-rup' => 'rup', - 'simple' => 'en', - 'zh-classical' => 'lzh', - 'zh-min-nan' => 'nan', - 'zh-yue' => 'yue', + * List of mappings from one language code to another. + * This array makes the codes not appear as a selectable language on the + * installer, and excludes them when running the transstat.php script. + * + * In Setup.php, the variable $wgDummyLanguageCodes is created by combining + * these codes with a list of "deprecated" codes, which are mostly leftovers + * from renames or other legacy things, and the internal codes 'qqq' and 'qqx'. + * If a mapping in $wgExtraLanguageCodes collide with a built-in mapping, the + * value in $wgExtraLanguageCodes will be used. + * + * @since 1.29 + */ +$wgExtraLanguageCodes = [ + 'bh' => 'bho', // Bihari language family + 'no' => 'nb', // Norwegian language family + 'simple' => 'en', // Simple English ]; +/** + * Functionally the same as $wgExtraLanguageCodes, but deprecated. Instead of + * appending values to this array, append them to $wgExtraLanguageCodes. + * + * @deprecated since 1.29 + */ +$wgDummyLanguageCodes = []; + /** * 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 @@ -4162,7 +4173,7 @@ $wgMaxPPExpandDepth = 40; * * WARNING: Do not add 'file:' to this or internal file links will be broken. * Instead, if you want to support file links, add 'file://'. The same applies - * to any other protocols with the same name as a namespace. See bug #44011 for + * to any other protocols with the same name as a namespace. See task T46011 for * more information. * * @see wfParseUrl @@ -4235,7 +4246,8 @@ $wgAllowImageTag = false; * - RaggettInternalPHP: Use the PECL extension * - RaggettExternal: Shell out to an external binary (tidyBin) * - Html5Depurate: Use external Depurate service - * - Html5Internal: Use the built-in HTML5 balancer + * - Html5Internal: Use the Balancer library in PHP + * - RemexHtml: Use the RemexHtml library in PHP * * - tidyConfigFile: Path to configuration file for any of the Raggett drivers * - debugComment: True to add a comment to the output with warning messages @@ -4565,8 +4577,8 @@ $wgAuthManagerAutoConfig = [ ], // Linking during login is experimental, enable at your own risk - T134952 // MediaWiki\Auth\ConfirmLinkSecondaryAuthenticationProvider::class => [ - // 'class' => MediaWiki\Auth\ConfirmLinkSecondaryAuthenticationProvider::class, - // 'sort' => 100, + // 'class' => MediaWiki\Auth\ConfirmLinkSecondaryAuthenticationProvider::class, + // 'sort' => 100, // ], MediaWiki\Auth\EmailNotificationSecondaryAuthenticationProvider::class => [ 'class' => MediaWiki\Auth\EmailNotificationSecondaryAuthenticationProvider::class, @@ -4865,9 +4877,7 @@ $wgDefaultUserOptions = [ /** * An array of preferences to not show for the user */ -$wgHiddenPrefs = [ - 'rcenhancedfilters', -]; +$wgHiddenPrefs = []; /** * Characters to prevent during new account creations. @@ -8560,6 +8570,7 @@ $wgCSPFalsePositiveUrls = [ 'https://atpixel.alephd.com' => true, 'https://rtb.metrigo.com' => true, 'https://d5p.de17a.com' => true, + 'https://ad.lkqd.net/vpaid/vpaid.js' => true, ]; /**