Merge "Use binary charset in default table options"

diff --combined includes/DefaultSettings.php
index 8c15e27,6515083..96d2e22
--- 1/includes/DefaultSettings.php
--- 2/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@@ -1380,14 -1380,14 +1380,14 @@@ $wgAntivirusRequired = true
  $wgVerifyMimeType = true;
  
  /**
 - * Sets the MIME type definition file to use by MimeMagic.php.
 + * Sets the MIME type definition file to use by includes/libs/mime/MimeAnalyzer.php.
   * Set to null, to use built-in defaults only.
   * example: $wgMimeTypeFile = '/etc/mime.types';
   */
  $wgMimeTypeFile = 'includes/mime.types';
  
  /**
 - * Sets the MIME type info file to use by MimeMagic.php.
 + * Sets the MIME type info file to use by includes/libs/mime/MimeAnalyzer.php.
   * Set to null, to use built-in defaults only.
   */
  $wgMimeInfoFile = 'includes/mime.info';
@@@ -1931,7 -1931,7 +1931,7 @@@ $wgDBprefix = ''
  /**
   * MySQL table options to use during installation or update
   */
- $wgDBTableOptions = 'ENGINE=InnoDB';
+ $wgDBTableOptions = 'ENGINE=InnoDB, DEFAULT CHARSET=binary';
  
  /**
   * SQL Mode - default is turning off all modes, including strict, if set.
@@@ -4267,26 -4267,17 +4267,26 @@@ $wgAllowImageTag = false
   * library; historically, Dave Raggett's "HTML Tidy" was typically used.
   * See https://www.w3.org/People/Raggett/tidy/
   *
 + * Setting this to null is deprecated.
 + *
   * If this is null and $wgUseTidy is true, the deprecated configuration
   * parameters will be used instead.
   *
   * If this is null and $wgUseTidy is false, a pure PHP fallback will be used.
 + * (Equivalent to setting `$wgTidyConfig['driver'] = 'disabled'`.)
   *
   * Keys are:
   *  - driver: May be:
 + *    - RemexHtml: Use the RemexHtml library in PHP
   *    - RaggettInternalHHVM: Use the limited-functionality HHVM extension
 + *      Deprecated since 1.32.
   *    - RaggettInternalPHP: Use the PECL extension
 + *      Deprecated since 1.32.
   *    - RaggettExternal: Shell out to an external binary (tidyBin)
 - *    - RemexHtml: Use the RemexHtml library in PHP
 + *      Deprecated since 1.32.
 + *    - disabled: Disable tidy pass and use a hacky pure PHP workaround
 + *      (this is what setting $wgUseTidy to false used to do)
 + *      Deprecated since 1.32.
   *
   *  - tidyConfigFile: Path to configuration file for any of the Raggett drivers
   *  - debugComment: True to add a comment to the output with warning messages
@@@ -4297,38 -4288,37 +4297,38 @@@ $wgTidyConfig = [ 'driver' => 'RemexHtm
  
  /**
   * Set this to true to use the deprecated tidy configuration parameters.
 - * @deprecated use $wgTidyConfig
 + * @deprecated since 1.26, use $wgTidyConfig['driver'] = 'disabled'
   */
  $wgUseTidy = false;
  
  /**
   * The path to the tidy binary.
 - * @deprecated Use $wgTidyConfig['tidyBin']
 + * @deprecated since 1.26, use $wgTidyConfig['tidyBin']
   */
  $wgTidyBin = 'tidy';
  
  /**
   * The path to the tidy config file
 - * @deprecated Use $wgTidyConfig['tidyConfigFile']
 + * @deprecated since 1.26, use $wgTidyConfig['tidyConfigFile']
   */
  $wgTidyConf = $IP . '/includes/tidy/tidy.conf';
  
  /**
   * The command line options to the tidy binary
 - * @deprecated Use $wgTidyConfig['tidyCommandLine']
 + * @deprecated since 1.26, use $wgTidyConfig['tidyCommandLine']
   */
  $wgTidyOpts = '';
  
  /**
   * Set this to true to use the tidy extension
 - * @deprecated Use $wgTidyConfig['driver']
 + * @deprecated since 1.26, use $wgTidyConfig['driver']
   */
  $wgTidyInternal = extension_loaded( 'tidy' );
  
  /**
   * Put tidy warnings in HTML comments
   * Only works for internal tidy.
 + * @deprecated since 1.26, use $wgTidyConfig['debugComment']
   */
  $wgDebugTidy = false;
  
@@@ -8017,7 -8007,6 +8017,7 @@@ $wgActions = 
        'info' => true,
        'markpatrolled' => true,
        'mcrundo' => McrUndoAction::class,
 +      'mcrrestore' => McrRestoreAction::class,
        'protect' => true,
        'purge' => true,
        'raw' => true,