Merge "Prevent blocked users from performing revision deletion"

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

diff --git a/includes/actions/HistoryAction.php b/includes/actions/HistoryAction.php
index a81adf9..ca47fce 100644 (file)
--- a/includes/actions/HistoryAction.php
+++ b/includes/actions/HistoryAction.php
@@ -192,7 +192,7 @@ class HistoryAction extends FormlessAction {
                        ( $tagSelector ? ( implode( ' ', $tagSelector ) . ' ' ) : '' ) .
                        $checkDeleted .
                        Html::submitButton(
-                               $this->msg( 'allpagessubmit' )->text(),
+                               $this->msg( 'historyaction-submit' )->text(),
                                array(),
                                array( 'mw-ui-progressive' )
                        ) . "\n" .
@@ -735,7 +735,7 @@ class HistoryPager extends ReverseChronologicalPager {
                        }
                }
                // Allow extension to add their own links here
-               Hooks::run( 'HistoryRevisionTools', array( $rev, &$tools ) );
+               Hooks::run( 'HistoryRevisionTools', array( $rev, &$tools, $prevRev, $user ) );
 
                if ( $tools ) {
                        $s2 .= ' ' . $this->msg( 'parentheses' )->rawParams( $lang->pipeList( $tools ) )->escaped();