Merge "Remove usages of Title::quickUserCan"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 29 Aug 2019 20:58:02 +0000 (20:58 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 29 Aug 2019 20:58:02 +0000 (20:58 +0000)
1  2 
includes/specials/pagers/ContribsPager.php

@@@ -439,16 -439,6 +439,16 @@@ class ContribsPager extends RangeChrono
                return $this->tagFilter;
        }
  
 +      /**
 +       * @deprecated since 1.34, redundant.
 +       *
 +       * @return string "users"
 +       */
 +      public function getContribs() {
 +              // Brought back for backwards compatibility, see T231540.
 +              return 'users';
 +      }
 +
        /**
         * @return string
         */
                $attribs = [];
  
                $linkRenderer = $this->getLinkRenderer();
+               $permissionManager = MediaWikiServices::getInstance()->getPermissionManager();
  
                $page = null;
                // Create a title for the revision if possible
                                $topmarktext .= '<span class="mw-uctop">' . $this->messages['uctop'] . '</span>';
                                $classes[] = 'mw-contributions-current';
                                # Add rollback link
-                               if ( !$row->page_is_new && $page->quickUserCan( 'rollback', $user )
-                                       && $page->quickUserCan( 'edit', $user )
+                               if ( !$row->page_is_new &&
+                                       $permissionManager->quickUserCan( 'rollback', $user, $page ) &&
+                                       $permissionManager->quickUserCan( 'edit', $user, $page )
                                ) {
                                        $this->preventClickjacking();
                                        $topmarktext .= ' ' . Linker::generateRollback( $rev, $this->getContext(),