From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Tue, 26 May 2009 12:29:16 +0000 (+0000)
Subject: (bug 18772) Removed redundant 'deletedrev' message instances
X-Git-Tag: 1.31.0-rc.0~41651
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=6496378f85b7a9d855cd5d88dc9dffa4e234740a;p=lhc%2Fweb%2Fwiklou.git

(bug 18772) Removed redundant 'deletedrev' message instances
---

diff --git a/includes/ChangesList.php b/includes/ChangesList.php
index 36292e2171..d14726bad2 100644
--- a/includes/ChangesList.php
+++ b/includes/ChangesList.php
@@ -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";
 		}
diff --git a/includes/PageHistory.php b/includes/PageHistory.php
index 5d0b026577..7354a896ed 100644
--- a/includes/PageHistory.php
+++ b/includes/PageHistory.php
@@ -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
diff --git a/includes/specials/SpecialContributions.php b/includes/specials/SpecialContributions.php
index fed8d13de5..8a4fc92e54 100644
--- a/includes/specials/SpecialContributions.php
+++ b/includes/specials/SpecialContributions.php
@@ -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' );
diff --git a/includes/specials/SpecialDeletedContributions.php b/includes/specials/SpecialDeletedContributions.php
index 05196a44b1..5d6615ed58 100644
--- a/includes/specials/SpecialDeletedContributions.php
+++ b/includes/specials/SpecialDeletedContributions.php
@@ -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";
 
diff --git a/includes/specials/SpecialRevisiondelete.php b/includes/specials/SpecialRevisiondelete.php
index 2118f77eb8..291705c229 100644
--- a/includes/specials/SpecialRevisiondelete.php
+++ b/includes/specials/SpecialRevisiondelete.php
@@ -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>";
 	}
 
 	/**
diff --git a/includes/specials/SpecialUndelete.php b/includes/specials/SpecialUndelete.php
index 47d6060544..fba8d9950a 100644
--- a/includes/specials/SpecialUndelete.php
+++ b/includes/specials/SpecialUndelete.php
@@ -902,7 +902,6 @@ class UndeleteForm {
 					array(),
 					$targetQuery
 				) .
-				( $isDeleted ? ' ' . wfMsgHtml( 'deletedrev' ) : '' ) .
 			'</strong></div>' .
 			'<div id="mw-diff-'.$prefix.'title2">' .
 				$sk->revUserTools( $rev ) . '<br/>' .