Merge "Resolve bug #18704 ("Add an unique CSS class or ID to the tagfilter table...

[lhc/web/wiklou.git] / includes / specials / SpecialListredirects.php

diff --git a/includes/specials/SpecialListredirects.php b/includes/specials/SpecialListredirects.php
index bb47c7b..f9cf3e6 100644 (file)
--- a/includes/specials/SpecialListredirects.php
+++ b/includes/specials/SpecialListredirects.php
@@ -43,6 +43,7 @@ class ListredirectsPage extends QueryPage {
                        'tables' => array( 'p1' => 'page', 'redirect', 'p2' => 'page' ),
                        'fields' => array( 'p1.page_namespace AS namespace',
                                        'p1.page_title AS title',
+                                       'p1.page_title AS value',
                                        'rd_namespace',
                                        'rd_title',
                                        'rd_fragment',
@@ -90,17 +91,15 @@ class ListredirectsPage extends QueryPage {
                        );
                } else {
                        $title = Title::makeTitle( $row->namespace, $row->title );
-                       $article = new Article( $title );
+                       $article = WikiPage::factory( $title );
                        return $article->getRedirectTarget();
                }
        }
 
        function formatResult( $skin, $result ) {
-               global $wgContLang;
-
                # Make a link to the redirect itself
                $rd_title = Title::makeTitle( $result->namespace, $result->title );
-               $rd_link = $skin->link(
+               $rd_link = Linker::link(
                        $rd_title,
                        null,
                        array(),
@@ -111,8 +110,9 @@ class ListredirectsPage extends QueryPage {
                $target = $this->getRedirectTarget( $result );
                if( $target ) {
                        # Make a link to the destination page
-                       $arr = $wgContLang->getArrow() . $wgContLang->getDirMark();
-                       $targetLink = $skin->link( $target );
+                       $lang = $this->getLanguage();
+                       $arr = $lang->getArrow() . $lang->getDirMark();
+                       $targetLink = Linker::link( $target );
                        return "$rd_link $arr $targetLink";
                } else {
                        return "<del>$rd_link</del>";