Merge "Provide a way to restore an old revision with multiple slots."

diff --combined autoload.php
index f63ccb5,77245ed..d939089
--- 1/autoload.php
--- 2/autoload.php
+++ b/autoload.php
@@@ -717,6 -717,7 +717,6 @@@ $wgAutoloadLocalClasses = 
        'JsonContentHandler' => __DIR__ . '/includes/content/JsonContentHandler.php',
        'KkConverter' => __DIR__ . '/languages/classes/LanguageKk.php',
        'KuConverter' => __DIR__ . '/languages/classes/LanguageKu.php',
 -      'LBFactory' => __DIR__ . '/includes/libs/rdbms/lbfactory/LBFactory.php',
        'LCStore' => __DIR__ . '/includes/cache/localisation/LCStore.php',
        'LCStoreCDB' => __DIR__ . '/includes/cache/localisation/LCStoreCDB.php',
        'LCStoreDB' => __DIR__ . '/includes/cache/localisation/LCStoreDB.php',
@@@ -849,6 -850,7 +849,7 @@@
        'MappedIterator' => __DIR__ . '/includes/libs/MappedIterator.php',
        'MarkpatrolledAction' => __DIR__ . '/includes/actions/MarkpatrolledAction.php',
        'McTest' => __DIR__ . '/maintenance/mctest.php',
+       'McrRestoreAction' => __DIR__ . '/includes/actions/McrRestoreAction.php',
        'McrUndoAction' => __DIR__ . '/includes/actions/McrUndoAction.php',
        'MediaHandler' => __DIR__ . '/includes/media/MediaHandler.php',
        'MediaHandlerFactory' => __DIR__ . '/includes/media/MediaHandlerFactory.php',
@@@ -950,6 -952,7 +951,6 @@@
        'MigrateFileRepoLayout' => __DIR__ . '/maintenance/migrateFileRepoLayout.php',
        'MigrateUserGroup' => __DIR__ . '/maintenance/migrateUserGroup.php',
        'MimeAnalyzer' => __DIR__ . '/includes/libs/mime/MimeAnalyzer.php',
 -      'MimeMagic' => __DIR__ . '/includes/MimeMagic.php',
        'MinifyScript' => __DIR__ . '/maintenance/minify.php',
        'MostcategoriesPage' => __DIR__ . '/includes/specials/SpecialMostcategories.php',
        'MostimagesPage' => __DIR__ . '/includes/specials/SpecialMostimages.php',

diff --combined includes/DefaultSettings.php
index 3ef5243,10eb443..8c15e27
--- 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';
@@@ -8017,6 -8017,7 +8017,7 @@@ $wgActions = 
        'info' => true,
        'markpatrolled' => true,
        'mcrundo' => McrUndoAction::class,
+       'mcrrestore' => McrRestoreAction::class,
        'protect' => true,
        'purge' => true,
        'raw' => true,