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

diff --git a/includes/LogEventsList.php b/includes/LogEventsList.php
index 7fee678..c56a08c 100644 (file)
--- 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 d33530c..c9e9578 100644 (file)
--- 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;
        }