From: jdlrobson Date: Tue, 26 Mar 2019 16:30:35 +0000 (-0700) Subject: Consistently use classes for deleted items in lists of diffs X-Git-Tag: 1.34.0-rc.0~2328 X-Git-Url: http://git.cyclocoop.org/data/%24self?a=commitdiff_plain;h=064dd53b284f46600aba2818db536d0874c10c89;p=lhc%2Fweb%2Fwiklou.git Consistently use classes for deleted items in lists of diffs Even if a revision has been deleted and the history-deleted class is being used, the original class for its corresponding element when not deleted should be applied. This is important as it allows skins to skin consistently. "history-deleted" is a modifier class - it provides further information on the original meaning. This blocks styling the history page from core in Minerva skin Bug: T216420 Change-Id: Ia659606838d7e38bc09054e36cd980b00f5e6da9 --- diff --git a/includes/Linker.php b/includes/Linker.php index ec3b245606..df9955609c 100644 --- a/includes/Linker.php +++ b/includes/Linker.php @@ -1093,7 +1093,7 @@ class Linker { $link = wfMessage( 'rev-deleted-user' )->escaped(); } if ( $rev->isDeleted( Revision::DELETED_USER ) ) { - return ' ' . $link . ''; + return ' ' . $link . ''; } return $link; } @@ -1519,7 +1519,7 @@ class Linker { $block = " " . wfMessage( 'rev-deleted-comment' )->escaped() . ""; } if ( $rev->isDeleted( Revision::DELETED_COMMENT ) ) { - return " $block"; + return " $block"; } return $block; } diff --git a/includes/actions/pagers/HistoryPager.php b/includes/actions/pagers/HistoryPager.php index 9e4080d2de..b3333726a0 100644 --- a/includes/actions/pagers/HistoryPager.php +++ b/includes/actions/pagers/HistoryPager.php @@ -485,7 +485,7 @@ class HistoryPager extends ReverseChronologicalPager { $link = htmlspecialchars( $date ); } if ( $rev->isDeleted( Revision::DELETED_TEXT ) ) { - $link = "$link"; + $link = "$link"; } return $link;