Use Title::makeName in Special:Export to simplify code

Also adjust param docs

Change-Id: Ia938b38c86da25e73b91a55506d660bc9ca9384f

diff --git a/includes/specials/SpecialExport.php b/includes/specials/SpecialExport.php
index 4407259..ac10c2f 100644 (file)
--- a/includes/specials/SpecialExport.php
+++ b/includes/specials/SpecialExport.php
@@ -418,7 +418,7 @@ class SpecialExport extends SpecialPage {
 
        /**
         * @param Title $title
-        * @return array
+        * @return string[]
         */
        private function getPagesFromCategory( $title ) {
                $maxPages = $this->getConfig()->get( 'ExportPagelistLimit' );
@@ -437,14 +437,7 @@ class SpecialExport extends SpecialPage {
                $pages = [];
 
                foreach ( $res as $row ) {
-                       $n = $row->page_title;
-                       if ( $row->page_namespace ) {
-                               $ns = MediaWikiServices::getInstance()->getContentLanguage()->getNsText(
-                                       $row->page_namespace );
-                               $n = $ns . ':' . $n;
-                       }
-
-                       $pages[] = $n;
+                       $pages[] = Title::makeName( $row->page_title, $row->page_namespace );
                }
 
                return $pages;
@@ -452,7 +445,7 @@ class SpecialExport extends SpecialPage {
 
        /**
         * @param int $nsindex
-        * @return array
+        * @return string[]
         */
        private function getPagesFromNamespace( $nsindex ) {
                $maxPages = $this->getConfig()->get( 'ExportPagelistLimit' );
@@ -469,15 +462,7 @@ class SpecialExport extends SpecialPage {
                $pages = [];
 
                foreach ( $res as $row ) {
-                       $n = $row->page_title;
-
-                       if ( $row->page_namespace ) {
-                               $ns = MediaWikiServices::getInstance()->getContentLanguage()->getNsText(
-                                       $row->page_namespace );
-                               $n = $ns . ':' . $n;
-                       }
-
-                       $pages[] = $n;
+                       $pages[] = Title::makeName( $row->page_title, $row->page_namespace );
                }
 
                return $pages;