From: Kunal Mehta <legoktm@member.fsf.org>
Date: Thu, 25 Aug 2016 06:49:00 +0000 (-0700)
Subject: Linker: Avoid Title in normaliseSpecialPage()
X-Git-Tag: 1.31.0-rc.0~5869^2~1
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dmes_infos.php?a=commitdiff_plain;h=e6d1b6715b1807346dbb6ba668333dca6ab4e319;p=lhc%2Fweb%2Fwiklou.git

Linker: Avoid Title in normaliseSpecialPage()

Now that SpecialPage::getTitleValueFor() exists, use it so that we can
avoid returning a Title object uncessarily.

Change-Id: I5bf605baf2ecad62e189421a2e5c556cc0b6f6ac
---

diff --git a/includes/Linker.php b/includes/Linker.php
index 5e540b9c03..d5507b77fa 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -316,7 +316,7 @@ class Linker {
 	/**
 	 * @since 1.16.3
 	 * @param LinkTarget $target
-	 * @return LinkTarget|Title You will get back the same type you passed in, or a Title object
+	 * @return LinkTarget
 	 */
 	public static function normaliseSpecialPage( LinkTarget $target ) {
 		if ( $target->getNamespace() == NS_SPECIAL ) {
@@ -324,7 +324,7 @@ class Linker {
 			if ( !$name ) {
 				return $target;
 			}
-			$ret = SpecialPage::getTitleFor( $name, $subpage, $target->getFragment() );
+			$ret = SpecialPage::getTitleValueFor( $name, $subpage, $target->getFragment() );
 			return $ret;
 		} else {
 			return $target;
@@ -571,7 +571,9 @@ class Linker {
 				}
 			}
 		} elseif ( isset( $frameParams['link-title'] ) && $frameParams['link-title'] !== '' ) {
-			$mtoParams['custom-title-link'] = self::normaliseSpecialPage( $frameParams['link-title'] );
+			$mtoParams['custom-title-link'] = Title::newFromLinkTarget(
+				self::normaliseSpecialPage( $frameParams['link-title'] )
+			);
 		} elseif ( !empty( $frameParams['no-link'] ) ) {
 			// No link
 		} else {