X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=includes%2Flogging%2FLogFormatter.php;h=ab7c5cb72b6a360ab410c79f631a049665f706fc;hp=68404bfcea3277b221cda19ca92c47fdd1ac742b;hb=732b5e2745ca8f6153e19cc10c3c9acb1b2a6331;hpb=c584722cc2e3d33edae58d46c2149063b3fc6d72

diff --git a/includes/logging/LogFormatter.php b/includes/logging/LogFormatter.php
index 68404bfcea..ab7c5cb72b 100644
--- a/includes/logging/LogFormatter.php
+++ b/includes/logging/LogFormatter.php
@@ -22,6 +22,8 @@
  * @license http://www.gnu.org/copyleft/gpl.html GNU General Public License 2.0 or later
  * @since 1.19
  */
+use MediaWiki\Linker\LinkRenderer;
+use MediaWiki\MediaWikiServices;
 
 /**
  * Implements the default log formatting.
@@ -101,6 +103,11 @@ class LogFormatter {
 	/** @var string */
 	protected $irctext = false;
 
+	/**
+	 * @var LinkRenderer|null
+	 */
+	private $linkRenderer;
+
 	protected function __construct( LogEntry $entry ) {
 		$this->entry = $entry;
 		$this->context = RequestContext::getMain();
@@ -114,6 +121,26 @@ class LogFormatter {
 		$this->context = $context;
 	}
 
+	/**
+	 * @since 1.30
+	 * @param LinkRenderer $linkRenderer
+	 */
+	public function setLinkRenderer( LinkRenderer $linkRenderer ) {
+		$this->linkRenderer = $linkRenderer;
+	}
+
+	/**
+	 * @since 1.30
+	 * @return LinkRenderer
+	 */
+	public function getLinkRenderer() {
+		if ( $this->linkRenderer !== null ) {
+			return $this->linkRenderer;
+		} else {
+			return MediaWikiServices::getInstance()->getLinkRenderer();
+		}
+	}
+
 	/**
 	 * Set the visibility restrictions for displaying content.
 	 * If set to public, and an item is deleted, then it will be replaced
@@ -617,12 +644,13 @@ class LogFormatter {
 	 * @return string
 	 */
 	protected function makePageLink( Title $title = null, $parameters = [], $html = null ) {
+		if ( !$title instanceof Title ) {
+			throw new MWException( 'Expected title, got null' );
+		}
 		if ( !$this->plaintext ) {
-			$link = Linker::link( $title, $html, [], $parameters );
+			$html = $html !== null ? new HtmlArmor( $html ) : $html;
+			$link = $this->getLinkRenderer()->makeLink( $title, $html, [], $parameters );
 		} else {
-			if ( !$title instanceof Title ) {
-				throw new MWException( "Expected title, got null" );
-			}
 			$link = '[[' . $title->getPrefixedText() . ']]';
 		}
 
@@ -839,10 +867,12 @@ class LogFormatter {
 			case 'title':
 			case 'title-link':
 				$title = Title::newFromText( $value );
-				if ( $title ) {
-					$value = [];
-					ApiQueryBase::addTitleInfo( $value, $title, "{$name}_" );
+				if ( !$title ) {
+					// Huh? Do something halfway sane.
+					$title = SpecialPage::getTitleFor( 'Badtitle', $value );
 				}
+				$value = [];
+				ApiQueryBase::addTitleInfo( $value, $title, "{$name}_" );
 				return $value;
 
 			case 'user':