Merge "Change the default for wgThumbnailMinimumBucketDistance"

diff --combined includes/DefaultSettings.php
index 4606e9e,91ab25a..86b7533
--- 1/includes/DefaultSettings.php
--- 2/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@@ -1224,10 -1224,9 +1224,10 @@@ $wgThumbLimits = array
  $wgThumbnailBuckets = null;
  
  /**
 - * When using thumbnail buckets as defined above, this sets the minimum distance with the bucket
 - * above the requested size. The distance represents how pany extra pixels of width the bucket needs
 - * in order to be used as the reference for a given thumbnail. For example, with the following buckets:
 + * When using thumbnail buckets as defined above, this sets the minimum distance to the bucket
 + * above the requested size. The distance represents how many extra pixels of width the bucket
 + * needs in order to be used as the reference for a given thumbnail. For example, with the
 + * following buckets:
   *
   * $wgThumbnailBuckets = array ( 128, 256, 512 );
   *
@@@ -1238,7 -1237,7 +1238,7 @@@
   * If we want to render a thumbnail of width 220px, the 512px bucket will be used,
   * because 220 + 50 = 270 and the closest bucket bigger than 270px is 512.
   */
- $wgThumbnailMinimumBucketDistance = 0;
+ $wgThumbnailMinimumBucketDistance = 50;
  
  /**
   * Default parameters for the "<gallery>" tag
@@@ -4400,8 -4399,6 +4400,8 @@@ $wgGroupPermissions['bureaucrat']['nora
  #$wgGroupPermissions['suppress']['hideuser'] = true;
  // To hide revisions/log items from users and Sysops
  #$wgGroupPermissions['suppress']['suppressrevision'] = true;
 +// To view revisions/log items hidden from users and Sysops
 +#$wgGroupPermissions['suppress']['viewsuppressed'] = true;
  // For private suppression log access
  #$wgGroupPermissions['suppress']['suppressionlog'] = true;
  
@@@ -7124,14 -7121,6 +7124,14 @@@ $wgHKDFAlgorithm = 'sha256'
   */
  $wgPageLanguageUseDB = false;
  
 +/**
 + * Enable use of the *_namespace fields of the pagelinks, redirect, and templatelinks tables.
 + * Set this only if the fields are fully populated. This may be removed in 1.25.
 + * @var bool
 + * @since 1.24
 + */
 +$wgUseLinkNamespaceDBFields = false;
 +
  /**
   * For really cool vim folding this needs to be at the end:
   * vim: foldmarker=@{,@} foldmethod=marker