From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Fri, 20 Sep 2019 00:22:16 +0000 (+0000)
Subject: Merge "Log entries can be rendered with parentheses in HTML"
X-Git-Tag: 1.34.0-rc.0~145
X-Git-Url: http://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=60882bb6b07aa0a9cbf0f8a2224cc94e2575dc11;hp=-c

Merge "Log entries can be rendered with parentheses in HTML"
---

60882bb6b07aa0a9cbf0f8a2224cc94e2575dc11
diff --combined includes/changes/ChangesList.php
index fbcbc35852,e64920156c..24b8e41807
--- a/includes/changes/ChangesList.php
+++ b/includes/changes/ChangesList.php
@@@ -23,7 -23,7 +23,7 @@@
   */
  use MediaWiki\Linker\LinkRenderer;
  use MediaWiki\MediaWikiServices;
 -use MediaWiki\Storage\RevisionRecord;
 +use MediaWiki\Revision\RevisionRecord;
  use Wikimedia\Rdbms\IResultWrapper;
  
  class ChangesList extends ContextSource {
@@@ -455,13 -455,21 +455,21 @@@
  	 * @param string &$s HTML to update
  	 * @param Title $title
  	 * @param string $logtype
+ 	 * @param bool $useParentheses (optional) Wrap log entry in parentheses where needed
  	 */
- 	public function insertLog( &$s, $title, $logtype ) {
+ 	public function insertLog( &$s, $title, $logtype, $useParentheses = true ) {
  		$page = new LogPage( $logtype );
  		$logname = $page->getName()->setContext( $this->getContext() )->text();
- 		$s .= Html::rawElement( 'span', [
- 			'class' => 'mw-changeslist-links'
- 		], $this->linkRenderer->makeKnownLink( $title, $logname ) );
+ 		$link = $this->linkRenderer->makeKnownLink( $title, $logname, [
+ 			'class' => $useParentheses ? '' : 'mw-changeslist-links'
+ 		] );
+ 		if ( $useParentheses ) {
+ 			$s .= $this->msg( 'parentheses' )->rawParams(
+ 				$link
+ 			)->escaped();
+ 		} else {
+ 			$s .= $link;
+ 		}
  	}
  
  	/**