Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(bug 18772) Removed redundant 'deletedrev' message instances

Browse source
This commit is contained in:
Aaron Schulz 2009-05-26 12:29:16 +00:00
parent ec70a23aa7
commit 6496378f85
6 changed files with 9 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
includes/ChangesList.php
View file

@ -447,10 +447,6 @@ class OldChangesList extends ChangesList {
# For subclasses
$this->insertExtra( $s, $rc, $classes );
# Mark revision as deleted if so
if( !$rc->mAttribs['rc_log_type'] && $this->isDeleted($rc,Revision::DELETED_TEXT) ) {
$s .= ' <tt>' . wfMsgHtml( 'deletedrev' ) . '</tt>';
}
# How many users watch this page
if( $rc->numberofWatchingusers > 0 ) {
$s .= ' ' . wfMsgExt( 'number_of_watching_users_RCview',
@ -865,11 +861,6 @@ class EnhancedChangesList extends ChangesList {
$this->insertRollback( $r, $rcObj );
# Tags
$this->insertTags( $r, $rcObj, $classes );
# Mark revision as deleted
if( !$rc_log_type && $this->isDeleted($rcObj,Revision::DELETED_TEXT) ) {
$r .= ' <tt>' . wfMsgHtml( 'deletedrev' ) . '</tt>';
}
$r .= "</td></tr>\n";
}

11
includes/PageHistory.php
View file

@ -320,19 +320,18 @@ class PageHistory {
if( $notificationtimestamp && ($row->rev_timestamp >= $notificationtimestamp) ) {
$s .= ' <span class="updatedmarker">' . wfMsgHtml( 'updatedmarker' ) . '</span>';
}
if( $rev->isDeleted( Revision::DELETED_TEXT ) ) {
$s .= ' <tt>' . wfMsgHtml( 'deletedrev' ) . '</tt>';
}
$tools = array();
if( !is_null( $next ) && is_object( $next ) ) {
if( $latest && $this->mTitle->userCan( 'rollback' ) && $this->mTitle->userCan( 'edit' ) ) {
$tools[] = '<span class="mw-rollback-link">'.$this->mSkin->buildRollbackLink( $rev ).'</span>';
$tools[] = '<span class="mw-rollback-link">'.
$this->mSkin->buildRollbackLink( $rev ).'</span>';
}
if( $this->mTitle->quickUserCan( 'edit' ) && !$rev->isDeleted( Revision::DELETED_TEXT ) &&
!$next->rev_deleted & Revision::DELETED_TEXT )
if( $this->mTitle->quickUserCan( 'edit' )
&& !$rev->isDeleted( Revision::DELETED_TEXT )
&& !$next->rev_deleted & Revision::DELETED_TEXT )
{
# Create undo tooltip for the first (=latest) line only
$undoTooltip = $latest

3
includes/specials/SpecialContributions.php
View file

@ -554,9 +554,6 @@ class ContribsPager extends ReverseChronologicalPager {
}
$ret = "{$del}{$d} {$histlink} {$difftext} {$nflag}{$mflag} {$link}{$userlink} {$comment} {$topmarktext}";
if( $rev->isDeleted( Revision::DELETED_TEXT ) ) {
$ret .= ' ' . wfMsgHtml( 'deletedrev' );
}
# Tags, if any.
list($tagSummary, $newClasses) = ChangeTags::formatSummaryRow( $row->ts_tags, 'contributions' );

3
includes/specials/SpecialDeletedContributions.php
View file

@ -180,9 +180,6 @@ class DeletedContribsPager extends IndexPager {
}
$ret = "{$del}{$link} ({$last}) ({$dellog}) ({$reviewlink}) . . {$mflag} {$pagelink} {$comment}";
if( $rev->isDeleted( Revision::DELETED_TEXT ) ) {
$ret .= ' ' . wfMsgHtml( 'deletedrev' );
}
$ret = "<li>$ret</li>\n";

16
includes/specials/SpecialRevisiondelete.php
View file

@ -599,7 +599,7 @@ class SpecialRevisionDelete extends UnlistedSpecialPage {
global $wgLang, $wgUser;
$date = $wgLang->timeanddate( $rev->getTimestamp() );
$difflink = $del = '';
$difflink = '';
// Live revisions
if( $this->deleteKey == 'oldid' ) {
$tokenParams = '&unhide=1&token='.urlencode( $wgUser->editToken( $rev->getId() ) );
@ -618,7 +618,6 @@ class SpecialRevisionDelete extends UnlistedSpecialPage {
// Check permissions; items may be "suppressed"
if( $rev->isDeleted(Revision::DELETED_TEXT) ) {
$revlink = '<span class="history-deleted">'.$revlink.'</span>';
$del = ' <tt>' . wfMsgHtml( 'deletedrev' ) . '</tt>';
if( !$rev->userCan(Revision::DELETED_TEXT) ) {
$revlink = '<span class="history-deleted">'.$date.'</span>';
$difflink = '(' . wfMsgHtml('diff') . ')';
@ -627,7 +626,7 @@ class SpecialRevisionDelete extends UnlistedSpecialPage {
$userlink = $this->skin->revUserLink( $rev );
$comment = $this->skin->revComment( $rev );
return "<li>$difflink $revlink $userlink $comment{$del}</li>";
return "<li>$difflink $revlink $userlink $comment</li>";
}
/**
@ -640,10 +639,8 @@ class SpecialRevisionDelete extends UnlistedSpecialPage {
$target = $this->page->getPrefixedText();
$date = $wgLang->timeanddate( $file->getTimestamp(), true );
$del = '';
# Hidden files...
if( $file->isDeleted(File::DELETED_FILE) ) {
$del = ' <tt>' . wfMsgHtml( 'deletedrev' ) . '</tt>';
if( !$file->userCan(File::DELETED_FILE) ) {
$pageLink = $date;
} else {
@ -663,7 +660,7 @@ class SpecialRevisionDelete extends UnlistedSpecialPage {
$data = htmlspecialchars( $data );
return "<li>$pageLink ".$this->fileUserTools( $file )." $data ".
$this->fileComment( $file )."$del</li>";
$this->fileComment( $file )."</li>";
}
/**
@ -680,18 +677,13 @@ class SpecialRevisionDelete extends UnlistedSpecialPage {
$pageLink = $this->skin->makeKnownLinkObj( $undelete, $date,
"target=$target&file={$file->getKey()}" );
$del = '';
if( $file->isDeleted(File::DELETED_FILE) ) {
$del = ' <tt>' . wfMsgHtml( 'deletedrev' ) . '</tt>';
}
$data = wfMsg( 'widthheight', $wgLang->formatNum( $file->getWidth() ),
$wgLang->formatNum( $file->getHeight() ) ) .
' (' . wfMsgExt( 'nbytes', 'parsemag', $wgLang->formatNum( $file->getSize() ) ) . ')';
$data = htmlspecialchars( $data );
return "<li>$pageLink ".$this->fileUserTools( $file )." $data ".
$this->fileComment( $file )."$del</li>";
$this->fileComment( $file )."</li>";
}
/**

1
includes/specials/SpecialUndelete.php
View file

@ -902,7 +902,6 @@ class UndeleteForm {
array(),
$targetQuery
) .
( $isDeleted ? ' ' . wfMsgHtml( 'deletedrev' ) : '' ) .
'</strong></div>' .
'<div id="mw-diff-'.$prefix.'title2">' .
$sk->revUserTools( $rev ) . '<br/>' .