Merge "Bump grunt to 1.0.1, remove grunt-cli"

[lhc/web/wiklou.git] / includes / actions / HistoryAction.php

diff --git a/includes/actions/HistoryAction.php b/includes/actions/HistoryAction.php
index 073b3ca..5ec10e6 100644 (file)
--- a/includes/actions/HistoryAction.php
+++ b/includes/actions/HistoryAction.php
@@ -517,6 +517,11 @@ class HistoryPager extends ReverseChronologicalPager {
                        $this->buttons .= Xml::tags( 'div', [ 'class' =>
                                'mw-history-revisionactions' ], $actionButtons );
                }
+
+               if ( $user->isAllowed( 'deleterevision' ) || $this->showTagEditUI ) {
+                       $this->buttons .= ( new ListToggle( $this->getOutput() ) )->getHTML();
+               }
+
                $this->buttons .= '</div>';
 
                $s .= $this->buttons;
@@ -677,7 +682,7 @@ class HistoryPager extends ReverseChronologicalPager {
                $s .= $dirmark;
 
                if ( $rev->isMinor() ) {
-                       $s .= ' ' . ChangesList::flag( 'minor' );
+                       $s .= ' ' . ChangesList::flag( 'minor', $this->getContext() );
                }
 
                # Sometimes rev_len isn't populated