From c78113b7cde937c11463a4b448bdbf06dec6f3f2 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Tue, 3 Mar 2009 20:12:37 +0000 Subject: [PATCH] Redundancy/perm cleanups to insertRollback() --- includes/ChangesList.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/includes/ChangesList.php b/includes/ChangesList.php index 96519fb80f..62eaf7e771 100644 --- a/includes/ChangesList.php +++ b/includes/ChangesList.php @@ -322,17 +322,18 @@ class ChangesList { /** Inserts a rollback link */ protected function insertRollback( &$s, &$rc ) { global $wgUser; - if( !$rc->mAttribs['rc_new'] && $rc->mAttribs['rc_this_oldid'] && $wgUser->isAllowed('rollback') ) { + if( !$rc->mAttribs['rc_new'] && $rc->mAttribs['rc_this_oldid'] && $rc->mAttribs['rc_cur_id'] ) { $page = $rc->getTitle(); /** Check for rollback and edit permissions, disallow special pages, and only * show a link on the top-most revision */ - if( $rc->mAttribs['rc_cur_id'] && $page->getLatestRevID() == $rc->mAttribs['rc_this_oldid'] - && $page->quickUserCan('rollback') && $page->quickUserCan('edit') ) + if( $page->quickUserCan('rollback') && $page->quickUserCan('edit') + && $page->getLatestRevID() == $rc->mAttribs['rc_this_oldid'] ) { $rev = new Revision( array( 'id' => $rc->mAttribs['rc_this_oldid'], 'user' => $rc->mAttribs['rc_user'], - 'user_text' => $rc->mAttribs['rc_user_text'] + 'user_text' => $rc->mAttribs['rc_user_text'], + 'deleted' => $rc->mAttribs['rc_deleted'] ) ); $rev->setTitle( $page ); $s .= ' '.$this->skin->generateRollback( $rev ); -- 2.20.1