(bug 23593) Made revision/date links enabled at history/contribs for deleted revs
authorAaron Schulz <aaron@users.mediawiki.org>
Mon, 24 May 2010 14:05:24 +0000 (14:05 +0000)
committerAaron Schulz <aaron@users.mediawiki.org>
Mon, 24 May 2010 14:05:24 +0000 (14:05 +0000)
includes/HistoryPage.php
includes/specials/SpecialContributions.php

index e791af4..1b7ad22 100644 (file)
@@ -590,7 +590,7 @@ class HistoryPager extends ReverseChronologicalPager {
                global $wgLang;
                $date = $wgLang->timeanddate( wfTimestamp(TS_MW, $rev->getTimestamp()), true );
                $date = htmlspecialchars( $date );
-               if( !$rev->isDeleted( Revision::DELETED_TEXT ) ) {
+               if ( $rev->userCan( Revision::DELETED_TEXT ) ) {
                        $link = $this->getSkin()->link(
                                $this->title,
                                $date,
@@ -599,7 +599,10 @@ class HistoryPager extends ReverseChronologicalPager {
                                array( 'known', 'noclasses' )
                        );
                } else {
-                       $link = "<span class=\"history-deleted\">$date</span>";
+                       $link = $date;
+               }
+               if ( $rev->isDeleted( Revision::DELETED_TEXT ) ) {
+                       $link = "<span class=\"history-deleted\">$link</span>";
                }
                return $link;
        }
index 3cb620b..444fd32 100644 (file)
@@ -604,15 +604,18 @@ class ContribsPager extends ReverseChronologicalPager {
 
                $comment = $wgContLang->getDirMark() . $sk->revComment( $rev, false, true );
                $date = $wgLang->timeanddate( wfTimestamp( TS_MW, $row->rev_timestamp ), true );
-               if( $rev->isDeleted( Revision::DELETED_TEXT ) ) {
-                       $d = '<span class="history-deleted">' . $date . '</span>';
-               } else {
+               if( $rev->userCan( Revision::DELETED_TEXT ) ) {
                        $d = $sk->linkKnown(
                                $page,
                                htmlspecialchars($date),
                                array(),
                                array( 'oldid' => intval( $row->rev_id ) )
                        );
+               } else {
+                       $d = $date;
+               }
+               if( $rev->isDeleted( Revision::DELETED_TEXT ) ) {
+                       $d = '<span class="history-deleted">' . $d . '</span>';
                }
 
                if( $this->target == 'newbies' ) {