From: Kunal Mehta <legoktm@member.fsf.org>
Date: Wed, 20 Apr 2016 08:43:51 +0000 (-0700)
Subject: Have Linker::normaliseSpecialPage() accept LinkTarget objects
X-Git-Tag: 1.31.0-rc.0~7159^2~1
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/password.php?a=commitdiff_plain;h=eec846227dfaf62cf59cc8a458008f5f4473d9cc;p=lhc%2Fweb%2Fwiklou.git

Have Linker::normaliseSpecialPage() accept LinkTarget objects

Change-Id: I762eaaeaf292f014e0443bf3c8fcf621ae8ee254
---

diff --git a/includes/Linker.php b/includes/Linker.php
index 977d71efb6..b2bc220854 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -446,19 +446,19 @@ class Linker {
 	}
 
 	/**
-	 * @param Title $title
-	 * @return Title
+	 * @param LinkTarget $target
+	 * @return LinkTarget|Title You will get back the same type you passed in, or a Title object
 	 */
-	static function normaliseSpecialPage( Title $title ) {
-		if ( $title->isSpecialPage() ) {
-			list( $name, $subpage ) = SpecialPageFactory::resolveAlias( $title->getDBkey() );
+	static function normaliseSpecialPage( LinkTarget $target ) {
+		if ( $target->getNamespace() == NS_SPECIAL ) {
+			list( $name, $subpage ) = SpecialPageFactory::resolveAlias( $target->getDBkey() );
 			if ( !$name ) {
-				return $title;
+				return $target;
 			}
-			$ret = SpecialPage::getTitleFor( $name, $subpage, $title->getFragment() );
+			$ret = SpecialPage::getTitleFor( $name, $subpage, $target->getFragment() );
 			return $ret;
 		} else {
-			return $title;
+			return $target;
 		}
 	}