From e07adc0e3c4b6301a987f04eff9d52b596e2e1a8 Mon Sep 17 00:00:00 2001
From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Fri, 30 Oct 2009 02:23:58 +0000
Subject: [PATCH] A few cleanups for r58351

---
 includes/Article.php                  |  5 +--
 includes/diff/DifferenceInterface.php | 60 +++++++++++++--------------
 2 files changed, 31 insertions(+), 34 deletions(-)

diff --git a/includes/Article.php b/includes/Article.php
index 42625e30b6..9bb8e35ab5 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -3456,11 +3456,10 @@ class Article {
 
 		$cdel = '';
 		// User can delete revisions or view deleted revisions...
-		$canHide = $wgUser->isAllowed('deleterevision');
+		$canHide = $wgUser->isAllowed( 'deleterevision' );
 		if( $canHide || ($revision->getVisibility() && $wgUser->isAllowed('deletedhistory')) ) {
-			// Is this hidden from Sysops?
 			if( !$revision->userCan( Revision::DELETED_RESTRICTED ) ) {
-				$cdel = $sk->revDeleteLinkDisabled( $canHide );
+				$cdel = $sk->revDeleteLinkDisabled( $canHide ); // rev was hidden from Sysops
 			} else {
 				$query = array(
 					'type'   => 'revision',
diff --git a/includes/diff/DifferenceInterface.php b/includes/diff/DifferenceInterface.php
index 2618635220..eed9d3e989 100644
--- a/includes/diff/DifferenceInterface.php
+++ b/includes/diff/DifferenceInterface.php
@@ -312,40 +312,38 @@ CONTROL;
 			$newminor = ChangesList::flag( 'minor' );
 		}
 
-		$rdel = ''; $ldel = '';
+		$rdel = $ldel = '';
 		# Handle RevisionDelete links...
-		if( $wgUser->isAllowed( 'deletedhistory' ) ) {
-			$canHide = $wgUser->isAllowed( 'deleterevision' );
-			// Don't show useless link to people who cannot hide revisions
-			if( $canHide || $this->mOldRev->getVisibility() ) {
-				if( !$this->mOldRev->userCan( Revision::DELETED_RESTRICTED ) ) {
-					$ldel = $sk->revDeleteLinkDisabled( $canHide ); // revision was hidden from sysops
-				} else {
-					$query = array( 
-						'type' => 'revision',
-						'target' => $this->mOldRev->mTitle->getPrefixedDbkey(),
-						'ids' => $this->mOldRev->getId()
-					);
-					$ldel = $sk->revDeleteLink( $query,
-						$this->mOldRev->isDeleted( Revision::DELETED_RESTRICTED ), $canHide );
-				}
-				$ldel = "&nbsp;&nbsp;&nbsp;$ldel ";
+		$canHide = $wgUser->isAllowed( 'deleterevision' );
+		// Don't show useless link to people who cannot hide revisions
+		if( $canHide || ($this->mOldRev->getVisibility() && $wgUser->isAllowed('deletedhistory')) ) {
+			if( !$this->mOldRev->userCan( Revision::DELETED_RESTRICTED ) ) {
+				$ldel = $sk->revDeleteLinkDisabled( $canHide ); // revision was hidden from sysops
+			} else {
+				$query = array( 
+					'type' => 'revision',
+					'target' => $this->mOldRev->mTitle->getPrefixedDbkey(),
+					'ids' => $this->mOldRev->getId()
+				);
+				$ldel = $sk->revDeleteLink( $query,
+					$this->mOldRev->isDeleted( Revision::DELETED_RESTRICTED ), $canHide );
 			}
-			// Don't show useless link to people who cannot hide revisions
-			if( $this->mNewRev->getVisibility() || $wgUser->isAllowed( 'deleterevision' ) ) {
-				if( !$this->mNewRev->userCan( Revision::DELETED_RESTRICTED ) ) {
-					$rdel = $sk->revDeleteLinkDisabled( $canHide ); // revision was hidden from sysops
-				} else {
-					$query = array( 
-						'type' => 'revision',
-						'target' =>  $this->mNewRev->mTitle->getPrefixedDbkey(),
-						'ids' => $this->mNewRev->getId()
-					);
-					$rdel = $sk->revDeleteLink( $query,
-						$this->mNewRev->isDeleted( Revision::DELETED_RESTRICTED ), $canHide );
-				}
-				$rdel = "&nbsp;&nbsp;&nbsp;$rdel ";
+			$ldel = "&nbsp;&nbsp;&nbsp;$ldel ";
+		}
+		// Don't show useless link to people who cannot hide revisions
+		if( $canHide || ($this->mNewRev->getVisibility() && $wgUser->isAllowed('deletedhistory')) ) {
+			if( !$this->mNewRev->userCan( Revision::DELETED_RESTRICTED ) ) {
+				$rdel = $sk->revDeleteLinkDisabled( $canHide ); // revision was hidden from sysops
+			} else {
+				$query = array( 
+					'type' => 'revision',
+					'target' =>  $this->mNewRev->mTitle->getPrefixedDbkey(),
+					'ids' => $this->mNewRev->getId()
+				);
+				$rdel = $sk->revDeleteLink( $query,
+					$this->mNewRev->isDeleted( Revision::DELETED_RESTRICTED ), $canHide );
 			}
+			$rdel = "&nbsp;&nbsp;&nbsp;$rdel ";
 		}
 
 		$oldHeader = '<div id="mw-diff-otitle1"><strong>'.$this->mOldtitle.'</strong></div>' .
-- 
2.20.1