* (bug 32512) Include 'associated namespace' checkbox on Special:Contributions

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

diff --git a/includes/specials/SpecialDoubleRedirects.php b/includes/specials/SpecialDoubleRedirects.php
index d25de5d..8837c07 100644 (file)
--- a/includes/specials/SpecialDoubleRedirects.php
+++ b/includes/specials/SpecialDoubleRedirects.php
@@ -32,7 +32,7 @@ class DoubleRedirectsPage extends PageQueryPage {
        function __construct( $name = 'DoubleRedirects' ) {
                parent::__construct( $name );
        }
-       
+
        function isExpensive() { return true; }
        function isSyndicated() { return false; }
        function sortDescending() { return false; }
@@ -49,6 +49,7 @@ class DoubleRedirectsPage extends PageQueryPage {
                                        'pb' => 'page', 'pc' => 'page' ),
                        'fields' => array ( 'pa.page_namespace AS namespace',
                                        'pa.page_title AS title',
+                                       'pa.page_title AS value',
                                        'pb.page_namespace AS nsb',
                                        'pb.page_title AS tb',
                                        'pc.page_namespace AS nsc',
@@ -76,8 +77,6 @@ class DoubleRedirectsPage extends PageQueryPage {
        }
 
        function formatResult( $skin, $result ) {
-               global $wgContLang;
-
                $titleA = Title::makeTitle( $result->namespace, $result->title );
 
                if ( $result && !isset( $result->nsb ) ) {
@@ -91,19 +90,20 @@ class DoubleRedirectsPage extends PageQueryPage {
                        }
                }
                if ( !$result ) {
-                       return '<del>' . $skin->link( $titleA, null, array(), array( 'redirect' => 'no' ) ) . '</del>';
+                       return '<del>' . Linker::link( $titleA, null, array(), array( 'redirect' => 'no' ) ) . '</del>';
                }
 
                $titleB = Title::makeTitle( $result->nsb, $result->tb );
                $titleC = Title::makeTitle( $result->nsc, $result->tc );
 
-               $linkA = $skin->linkKnown(
+               $linkA = Linker::linkKnown(
                        $titleA,
                        null,
                        array(),
                        array( 'redirect' => 'no' )
                );
-               $edit = $skin->linkKnown(
+
+               $edit = Linker::linkKnown(
                        $titleA,
                        wfMsgExt( 'parentheses', array( 'escape' ), wfMsg( 'editlink' ) ),
                        array(),
@@ -112,14 +112,18 @@ class DoubleRedirectsPage extends PageQueryPage {
                                'action' => 'edit'
                        )
                );
-               $linkB = $skin->linkKnown(
+
+               $linkB = Linker::linkKnown(
                        $titleB,
                        null,
                        array(),
                        array( 'redirect' => 'no' )
                );
-               $linkC = $skin->linkKnown( $titleC );
-               $arr = $wgContLang->getArrow() . $wgContLang->getDirMark();
+
+               $linkC = Linker::linkKnown( $titleC );
+
+               $lang = $this->getLanguage();
+               $arr = $lang->getArrow() . $lang->getDirMark();
 
                return( "{$linkA} {$edit} {$arr} {$linkB} {$arr} {$linkC}" );
        }