X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=includes%2Fchanges%2FChangesList.php;h=bf275b36d3e56a9fdc72c92f4eb223c9363de42e;hb=2a9a2533fa61847c5235c5c64f546c7fc360b988;hp=b1dff1492488ef1a8b0fb2b4c46231786b5f05ce;hpb=ebc4d535f196b1d78b6b53cb95cda35d9cb6295e;p=lhc%2Fweb%2Fwiklou.git
diff --git a/includes/changes/ChangesList.php b/includes/changes/ChangesList.php
index b1dff14924..bf275b36d3 100644
--- a/includes/changes/ChangesList.php
+++ b/includes/changes/ChangesList.php
@@ -58,8 +58,6 @@ class ChangesList extends ContextSource {
protected $filterGroups;
/**
- * Changeslist constructor
- *
* @param Skin|IContextSource $obj
* @param array $filterGroups Array of ChangesListFilterGroup objects (currently optional)
*/
@@ -291,7 +289,10 @@ class ChangesList extends ContextSource {
$this->rcCacheIndex = 0;
$this->lastdate = '';
$this->rclistOpen = false;
- $this->getOutput()->addModuleStyles( 'mediawiki.special.changeslist' );
+ $this->getOutput()->addModuleStyles( [
+ 'mediawiki.interface.helpers.styles',
+ 'mediawiki.special.changeslist'
+ ] );
return '
';
}
@@ -454,11 +455,9 @@ class ChangesList extends ContextSource {
);
}
if ( $rc->mAttribs['rc_type'] == RC_CATEGORIZE ) {
- $diffhist = $diffLink . $this->message['pipe-separator'] . $this->message['hist'];
+ $histLink = $this->message['hist'];
} else {
- $diffhist = $diffLink . $this->message['pipe-separator'];
- # History link
- $diffhist .= $this->linkRenderer->makeKnownLink(
+ $histLink = $this->linkRenderer->makeKnownLink(
$rc->getTitle(),
new HtmlArmor( $this->message['hist'] ),
[ 'class' => 'mw-changeslist-history' ],
@@ -469,20 +468,11 @@ class ChangesList extends ContextSource {
);
}
- // @todo FIXME: Hard coded ". .". Is there a message for this? Should there be?
- $s .= $this->msg( 'parentheses' )->rawParams( $diffhist )->escaped() .
- ' . . ';
- }
-
- /**
- * @param string &$s Article link will be appended to this string, in place.
- * @param RecentChange $rc
- * @param bool $unpatrolled
- * @param bool $watched
- * @deprecated since 1.27, use getArticleLink instead.
- */
- public function insertArticleLink( &$s, RecentChange $rc, $unpatrolled, $watched ) {
- $s .= $this->getArticleLink( $rc, $unpatrolled, $watched );
+ $s .= Html::rawElement( 'div', [ 'class' => 'mw-changeslist-links' ],
+ Html::rawElement( 'span', [], $diffLink ) .
+ Html::rawElement( 'span', [], $histLink )
+ ) .
+ ' ';
}
/**
@@ -535,7 +525,7 @@ class ChangesList extends ContextSource {
htmlspecialchars( $this->getLanguage()->userTime(
$rc->mAttribs['rc_timestamp'],
$this->getUser()
- ) ) . ' . . ';
+ ) ) . ' ';
}
/**
@@ -561,7 +551,13 @@ class ChangesList extends ContextSource {
} else {
$s .= $this->getLanguage()->getDirMark() . Linker::userLink( $rc->mAttribs['rc_user'],
$rc->mAttribs['rc_user_text'] );
- $s .= Linker::userToolLinks( $rc->mAttribs['rc_user'], $rc->mAttribs['rc_user_text'] );
+ $s .= Linker::userToolLinks(
+ $rc->mAttribs['rc_user'], $rc->mAttribs['rc_user_text'],
+ false, 0, null,
+ // The text content of tools is not wrapped with parenthesises or "piped".
+ // This will be handled in CSS (T205581).
+ false
+ );
}
}