From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Mon, 24 May 2010 18:15:52 +0000 (+0000)
Subject: * Removed leftover token check of unhide=1 that was removed elsewhere
X-Git-Tag: 1.31.0-rc.0~36743
X-Git-Url: http://git.cyclocoop.org///%22%40url%40//%22?a=commitdiff_plain;h=fb29f7b1af2306d53e7456ea5a37f17bf0d188ed;p=lhc%2Fweb%2Fwiklou.git

* Removed leftover token check of unhide=1 that was removed elsewhere
* Diff doc tweak
---

diff --git a/includes/Article.php b/includes/Article.php
index 5d7912ec01..a747f25049 100644
--- a/includes/Article.php
+++ b/includes/Article.php
@@ -3487,8 +3487,7 @@ class Article {
 			return;
 		}
 
-		$unhide = $wgRequest->getInt( 'unhide' ) == 1 &&
-			$wgUser->matchEditToken( $wgRequest->getVal( 'token' ), $oldid );
+		$unhide = $wgRequest->getInt( 'unhide' ) == 1;
 		# Cascade unhide param in links for easy deletion browsing
 		$extraParams = array();
 		if ( $wgRequest->getVal( 'unhide' ) ) {
diff --git a/includes/diff/DifferenceInterface.php b/includes/diff/DifferenceInterface.php
index adc619da51..e0fe0ee45c 100644
--- a/includes/diff/DifferenceInterface.php
+++ b/includes/diff/DifferenceInterface.php
@@ -40,7 +40,7 @@ class DifferenceEngine {
 	// readability and conserve space with many small diffs.
 	protected $mReducedLineNumbers = false;
 
-	protected $unhide = false;
+	protected $unhide = false; # show rev_deleted content if allowed
 	/**#@-*/
 
 	/**