For consistency of the interface, don't do expensive checks on page view.

Also replaced two $this->getUser() calls with $user since that variable is
already in that method.

Change-Id: Iccda9f44a9cf6d3187895a8b6111bc62dca1e811

diff --git a/includes/actions/HistoryAction.php b/includes/actions/HistoryAction.php
index 7393315..1dacabc 100644 (file)
--- a/includes/actions/HistoryAction.php
+++ b/includes/actions/HistoryAction.php
@@ -618,10 +618,8 @@ class HistoryPager extends ReverseChronologicalPager {
                $tools = array();
 
                # Rollback and undo links
-               if ( $prevRev &&
-                       !count( $this->getTitle()->getUserPermissionsErrors( 'edit', $this->getUser() ) ) )
-               {
-                       if ( $latest && !count( $this->getTitle()->getUserPermissionsErrors( 'rollback', $this->getUser() ) ) ) {
+               if ( $prevRev && $this->getTitle()->quickUserCan( 'edit', $user ) ) {
+                       if ( $latest && $this->getTitle()->quickUserCan( 'rollback', $user ) ) {
                                $this->preventClickjacking();
                                $tools[] = '<span class="mw-rollback-link">' .
                                        Linker::buildRollbackLink( $rev, $this->getContext() ) . '</span>';