jenkins-bot has submitted this change and it was merged.
Change subject: Have Linker::normaliseSpecialPage() accept LinkTarget objects
......................................................................
Have Linker::normaliseSpecialPage() accept LinkTarget objects
Change-Id: I762eaaeaf292f014e0443bf3c8fcf621ae8ee254
---
M includes/Linker.php
1 file changed, 8 insertions(+), 8 deletions(-)
Approvals:
Addshore: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Linker.php b/includes/Linker.php
index 977d71e..b2bc220 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -446,19 +446,19 @@
}
/**
- * @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;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/284422
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I762eaaeaf292f014e0443bf3c8fcf621ae8ee254
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Jackmcbarn <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
