Merge "Implement non-JS RollbackAction with form"

diff --combined includes/Linker.php
index 4f9d423,711b9dc..a02d57d
--- 1/includes/Linker.php
--- 2/includes/Linker.php
+++ b/includes/Linker.php
@@@ -1769,8 -1769,6 +1769,8 @@@ class Linker 
                }
  
                if ( $context->getUser()->getBoolOption( 'showrollbackconfirmation' ) ) {
 +                      $stats = MediaWikiServices::getInstance()->getStatsdDataFactory();
 +                      $stats->increment( 'rollbackconfirmation.event.load' );
                        $context->getOutput()->addModules( 'mediawiki.page.rollback.confirmation' );
                }
  
@@@ -1867,21 -1865,25 +1867,25 @@@
                }
  
                $title = $rev->getTitle();
+ 
                $query = [
                        'action' => 'rollback',
                        'from' => $rev->getUserText(),
                        'token' => $context->getUser()->getEditToken( 'rollback' ),
                ];
+ 
                $attrs = [
                        'data-mw' => 'interface',
                        'title' => $context->msg( 'tooltip-rollback' )->text(),
                        'data-rollback-count' => (int)$editCount
                ];
+ 
                $options = [ 'known', 'noclasses' ];
  
                if ( $context->getRequest()->getBool( 'bot' ) ) {
+                       //T17999
+                       $query['hidediff'] = '1';
                        $query['bot'] = '1';
-                       $query['hidediff'] = '1'; // T17999
                }
  
                $disableRollbackEditCount = false;