Merge "Have Linker::normaliseSpecialPage() accept LinkTarget objects"

diff --combined includes/Linker.php
index ccf948a,b2bc220..071f95e
--- 1/includes/Linker.php
--- 2/includes/Linker.php
+++ b/includes/Linker.php
@@@ -446,19 -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;
                }
        }
  
@@@ -2361,3 -2361,20 +2361,3 @@@
  
  }
  
 -/**
 - * @since 1.18
 - */
 -class DummyLinker {
 -
 -      /**
 -       * Use PHP's magic __call handler to transform instance calls to a dummy instance
 -       * into static calls to the new Linker for backwards compatibility.
 -       *
 -       * @param string $fname Name of called method
 -       * @param array $args Arguments to the method
 -       * @return mixed
 -       */
 -      public function __call( $fname, $args ) {
 -              return call_user_func_array( [ 'Linker', $fname ], $args );
 -      }
 -}