From 52a311bd8184af6b1021cde5acee53f28c3085dd Mon Sep 17 00:00:00 2001 From: Alex Z Date: Tue, 20 Jan 2009 00:16:35 +0000 Subject: [PATCH] Follow-up to r45883: "(bug 17055) Use a CSS class ('mw-revdelundel-link') for RevisionDelete "(show/hide)" links rather than hardcoded , reduce some code duplication by creating Linker::revDeleteLink() to make the links." Change a couple instances I missed the first time --- includes/PageHistory.php | 18 +++++++----------- includes/specials/SpecialUndelete.php | 15 +++++---------- 2 files changed, 12 insertions(+), 21 deletions(-) diff --git a/includes/PageHistory.php b/includes/PageHistory.php index 27880c60da..b3b9fc5dab 100644 --- a/includes/PageHistory.php +++ b/includes/PageHistory.php @@ -291,23 +291,19 @@ class PageHistory { $s = "($curlink) ($lastlink) $arbitrary"; if( $wgUser->isAllowed( 'deleterevision' ) ) { - $revdel = SpecialPage::getTitleFor( 'Revisiondelete' ); if( $firstInList ) { // We don't currently handle well changing the top revision's settings - $del = $this->message['rev-delundel']; + $del = Xml::tags( 'span', array( 'class'=>'mw-revdelundel-link' ), '('.$this->message['rev-delundel'].')' ); } else if( !$rev->userCan( Revision::DELETED_RESTRICTED ) ) { // If revision was hidden from sysops - $del = $this->message['rev-delundel']; + $del = Xml::tags( 'span', array( 'class'=>'mw-revdelundel-link' ), '('.$this->message['rev-delundel'].')' ); } else { - $del = $this->mSkin->makeKnownLinkObj( $revdel, - $this->message['rev-delundel'], - 'target=' . urlencode( $this->mTitle->getPrefixedDbkey() ) . - '&oldid=' . urlencode( $rev->getId() ) ); - // Bolden oversighted content - if( $rev->isDeleted( Revision::DELETED_RESTRICTED ) ) - $del = "$del"; + $query = array( 'target' => $this->mTitle->getPrefixedDbkey(), + 'oldid' => $rev->getId() + ); + $del = $this->mSkin->revDeleteLink( $query, $rev->isDeleted( Revision::DELETED_RESTRICTED ) ); } - $s .= " ($del) "; + $s .= " $del "; } $s .= " $link"; diff --git a/includes/specials/SpecialUndelete.php b/includes/specials/SpecialUndelete.php index 4bbaff6b29..54a317c426 100644 --- a/includes/specials/SpecialUndelete.php +++ b/includes/specials/SpecialUndelete.php @@ -1174,20 +1174,15 @@ class UndeleteForm { $comment = $this->getFileComment( $file, $sk ); $revdlink = ''; if( $wgUser->isAllowed( 'deleterevision' ) ) { - $revdel = SpecialPage::getTitleFor( 'Revisiondelete' ); if( !$file->userCan(File::DELETED_RESTRICTED ) ) { // If revision was hidden from sysops - $del = wfMsgHtml('rev-delundel'); + $revdlink = Xml::tags( 'span', array( 'class'=>'mw-revdelundel-link' ), '('.wfMsgHtml('rev-delundel').')' ); } else { - $del = $sk->makeKnownLinkObj( $revdel, - wfMsgHtml('rev-delundel'), - 'target=' . $this->mTargetObj->getPrefixedUrl() . - '&fileid=' . $row->fa_id ); - // Bolden oversighted content - if( $file->isDeleted( File::DELETED_RESTRICTED ) ) - $del = "$del"; + $query = array( 'target' => $this->mTargetObj->getPrefixedUrl(), + 'fileid' => $row->fa_id + ); + $revdlink = $sk->revDeleteLink( $query, $file->isDeleted( File::DELETED_RESTRICTED ) ); } - $revdlink = "($del)"; } return "
  • $checkBox $revdlink $pageLink . . $userLink $data $comment
  • \n"; } -- 2.20.1