X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FLinker.php;h=4f0ab6a65d71bfb4cf7964d3f36ad1a6ba1a6789;hb=79502d48e636a31c05ef5f52753a634767cbc4cb;hp=ec3b24560616b3b61409e4c7afe368f9152a7dfc;hpb=be096deafc0685f0d82471ef5f786244b4afda0a;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/Linker.php b/includes/Linker.php index ec3b245606..4f0ab6a65d 100644 --- a/includes/Linker.php +++ b/includes/Linker.php @@ -1001,7 +1001,7 @@ class Linker { * @return string */ public static function userToolLinksRedContribs( $userId, $userText, $edits = null ) { - return self::userToolLinks( $userId, $userText, true, 0, $edits ); + return self::userToolLinks( $userId, $userText, true, 0, $edits, false ); } /** @@ -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; } @@ -1765,15 +1765,7 @@ class Linker { $inner = $context->msg( 'brackets' )->rawParams( $inner )->escaped(); } - /** - * FIXME - * Remove all references to DisableRollbackConfirmationFeature - * after release of rollback feature. See T199534 - */ - if ( !MediaWikiServices::getInstance() - ->getMainConfig()->get( 'DisableRollbackConfirmationFeature' ) && - $context->getUser()->getBoolOption( 'showrollbackconfirmation' ) - ) { + if ( $context->getUser()->getBoolOption( 'showrollbackconfirmation' ) ) { $stats = MediaWikiServices::getInstance()->getStatsdDataFactory(); $stats->increment( 'rollbackconfirmation.event.load' ); $context->getOutput()->addModules( 'mediawiki.page.rollback.confirmation' );