From e6d1b6715b1807346dbb6ba668333dca6ab4e319 Mon Sep 17 00:00:00 2001 From: Kunal Mehta Date: Wed, 24 Aug 2016 23:49:00 -0700 Subject: [PATCH] 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 --- includes/Linker.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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 { -- 2.20.1