From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Tue, 19 May 2009 19:19:41 +0000 (+0000)
Subject: (bug 17060) Renders edit comments the same for all users wrt to revdelete
X-Git-Tag: 1.31.0-rc.0~41734
X-Git-Url: http://git.cyclocoop.org/clavettes/images/siteon3.jpg?a=commitdiff_plain;h=d43c8027f5ee01ef0de3c46f1305b21ef10f9895;p=lhc%2Fweb%2Fwiklou.git

(bug 17060) Renders edit comments the same for all users wrt to revdelete
---

diff --git a/includes/LogEventsList.php b/includes/LogEventsList.php
index 7fee678d69..c56a08c9c4 100644
--- a/includes/LogEventsList.php
+++ b/includes/LogEventsList.php
@@ -654,7 +654,6 @@ class LogPager extends ReverseChronologicalPager {
 		$tables = array( 'logging', 'user' );
 		$this->mConds[] = 'user_id = log_user';
 		$groupBy = false;
-		$index = array();
 		# Add log_search table if there are conditions on it
 		if( array_key_exists('ls_field',$this->mConds) ) {
 			$tables[] = 'log_search';
diff --git a/includes/PageHistory.php b/includes/PageHistory.php
index d33530cecc..c9e9578a7a 100644
--- a/includes/PageHistory.php
+++ b/includes/PageHistory.php
@@ -373,13 +373,10 @@ class PageHistory {
 	function revLink( $rev ) {
 		global $wgLang;
 		$date = $wgLang->timeanddate( wfTimestamp(TS_MW, $rev->getTimestamp()), true );
-		if( $rev->userCan( Revision::DELETED_TEXT ) ) {
+		if( !$rev->isDeleted( Revision::DELETED_TEXT ) ) {
 			$link = $this->mSkin->makeKnownLinkObj( $this->mTitle, $date, "oldid=" . $rev->getId() );
 		} else {
-			$link = $date;
-		}
-		if( $rev->isDeleted( Revision::DELETED_TEXT ) ) {
-			$link = "<span class=\"history-deleted\">$link</span>";
+			$link = "<span class=\"history-deleted\">$date</span>";
 		}
 		return $link;
 	}