X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2FLinker.php;h=4f0ab6a65d71bfb4cf7964d3f36ad1a6ba1a6789;hp=5e07f1e1de2f0c725908958d68346fc3b670f509;hb=a38af7ba26579bb3004f673e44d39710887763aa;hpb=bd8b634b4ce7396adefd42a5d96baf0f5fada95f
diff --git a/includes/Linker.php b/includes/Linker.php
index 5e07f1e1de..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 );
}
/**
@@ -1077,21 +1077,23 @@ class Linker {
* @since 1.16.3
* @param Revision $rev
* @param bool $isPublic Show only if all users can see it
+ * @param bool $useParentheses (optional) Wrap comments in parentheses where needed
* @return string HTML
*/
- public static function revUserTools( $rev, $isPublic = false ) {
+ public static function revUserTools( $rev, $isPublic = false, $useParentheses = true ) {
if ( $rev->isDeleted( Revision::DELETED_USER ) && $isPublic ) {
$link = wfMessage( 'rev-deleted-user' )->escaped();
} elseif ( $rev->userCan( Revision::DELETED_USER ) ) {
$userId = $rev->getUser( Revision::FOR_THIS_USER );
$userText = $rev->getUserText( Revision::FOR_THIS_USER );
$link = self::userLink( $userId, $userText )
- . self::userToolLinks( $userId, $userText );
+ . self::userToolLinks( $userId, $userText, false, 0, null,
+ $useParentheses );
} else {
$link = wfMessage( 'rev-deleted-user' )->escaped();
}
if ( $rev->isDeleted( Revision::DELETED_USER ) ) {
- return ' ' . $link . '';
+ return ' ' . $link . '';
}
return $link;
}
@@ -1517,7 +1519,7 @@ class Linker {
$block = " ";
}
if ( $rev->isDeleted( Revision::DELETED_COMMENT ) ) {
- return " $block";
+ return " $block";
}
return $block;
}
@@ -1532,9 +1534,8 @@ class Linker {
$stxt = wfMessage( 'historyempty' )->escaped();
} else {
$stxt = wfMessage( 'nbytes' )->numParams( $size )->escaped();
- $stxt = wfMessage( 'parentheses' )->rawParams( $stxt )->escaped();
}
- return "$stxt";
+ return "$stxt";
}
/**
@@ -1710,12 +1711,8 @@ class Linker {
static function splitTrail( $trail ) {
$regex = MediaWikiServices::getInstance()->getContentLanguage()->linkTrail();
$inside = '';
- if ( $trail !== '' ) {
- $m = [];
- if ( preg_match( $regex, $trail, $m ) ) {
- $inside = $m[1];
- $trail = $m[2];
- }
+ if ( $trail !== '' && preg_match( $regex, $trail, $m ) ) {
+ list( , $inside, $trail ) = $m;
}
return [ $inside, $trail ];
}
@@ -1768,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' );