Merge "MCR: Add temporary web UI mcrundo action"

diff --combined RELEASE-NOTES-1.32
index a7fc232,e3bb6d3..ec8c022
--- 1/RELEASE-NOTES-1.32
--- 2/RELEASE-NOTES-1.32
+++ b/RELEASE-NOTES-1.32
@@@ -75,6 -75,11 +75,11 @@@ production
    render diffs between two Content objects, and DifferenceEngine::setRevisions()
    to render diffs between two custom (potentially multi-content) revisions.
    Added GetSlotDiffRenderer hook which works like GetDifferenceEngine for slots.
+ * Added a temporary action=mcrundo to the web UI, as the normal undo logic
+   can't yet handle MCR and deadlines are forcing is to put off fixing that.
+   This action should be considered deprecated and should not be used directly.
+ * Extensions overriding ContentHandler::getUndoContent() will need to be
+   updated for the changed method signature.
  
  === External library changes in 1.32 ===
  * …
@@@ -136,18 -141,6 +141,18 @@@
  * action=query&prop=deletedrevisions, action=query&list=allrevisions, and
    action=query&list=alldeletedrevisions are changed similarly to
    &prop=revisions (see the three previous items).
 +* (T174032) action=compare now supports multi-content revisions.
 +  * It has a 'slots' parameter to select diffing of individual slots. The
 +    default behavior is to return one combined diff.
 +  * The 'fromtext', 'fromsection', 'fromcontentmodel', 'fromcontentformat',
 +    'totext', 'tosection', 'tocontentmodel', and 'tocontentformat' parameters
 +    are deprecated. Specify the new 'fromslots' and 'toslots' to identify which
 +    slots have text supplied and the corresponding templated parameters for
 +    each slot.
 +  * The behavior of 'fromsection' and 'tosection' of extracting one section's
 +    content is not being preserved. 'fromsection-{slot}' and 'tosection-{slot}'
 +    instead expand the given text as if for a section edit. This effectively
 +    declines T183823 in favor of T185723.
  
  === Action API internal changes in 1.32 ===
  * Added 'ApiParseMakeOutputPage' hook.
@@@ -389,6 -382,8 +394,8 @@@ because of Phabricator reports
    MediaWikiServices.
  * mw.user.stickyRandomId was renamed to the more explicit
    mw.user.getPageviewToken to better capture its function.
+ * Passing Revision objects to ContentHandler::getUndoContent() is deprecated,
+   Content object should be passed instead.
  
  === Other changes in 1.32 ===
  * (T198811) The following tables have had their UNIQUE indexes turned into

diff --combined includes/DefaultSettings.php
index 164eb46,fd943cc..9b0899d
--- 1/includes/DefaultSettings.php
--- 2/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@@ -3792,16 -3792,6 +3792,16 @@@ $wgResourceLoaderMaxQueryLength = false
   */
  $wgResourceLoaderValidateJS = true;
  
 +/**
 + * When enabled, execution of JavaScript modules is profiled client-side.
 + *
 + * Instrumentation happens in mw.loader.profiler.
 + * Use `mw.inspect('time')` from the browser console to display the data.
 + *
 + * @since 1.32
 + */
 +$wgResourceLoaderEnableJSProfiler = false;
 +
  /**
   * Whether ResourceLoader should attempt to persist modules in localStorage on
   * browsers that support the Web Storage API.
@@@ -8008,6 -7998,7 +8008,7 @@@ $wgActions = 
        'history' => true,
        'info' => true,
        'markpatrolled' => true,
+       'mcrundo' => McrUndoAction::class,
        'protect' => true,
        'purge' => true,
        'raw' => true,