Do not register Special:JavaScriptTest, if disabled

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

diff --git a/includes/specials/SpecialListredirects.php b/includes/specials/SpecialListredirects.php
index 21f8aec..f4acd64 100644 (file)
--- a/includes/specials/SpecialListredirects.php
+++ b/includes/specials/SpecialListredirects.php
@@ -33,21 +33,30 @@ class ListredirectsPage extends QueryPage {
        function __construct( $name = 'Listredirects' ) {
                parent::__construct( $name );
        }
-       
-       function isExpensive() { return true; }
-       function isSyndicated() { return false; }
-       function sortDescending() { return false; }
+
+       function isExpensive() {
+               return true;
+       }
+
+       function isSyndicated() {
+               return false;
+       }
+
+       function sortDescending() {
+               return false;
+       }
 
        function getQueryInfo() {
                return array(
                        'tables' => array( 'p1' => 'page', 'redirect', 'p2' => 'page' ),
-                       'fields' => array( 'p1.page_namespace AS namespace',
-                                       'p1.page_title AS title',
+                       'fields' => array( 'namespace' => 'p1.page_namespace',
+                                       'title' => 'p1.page_title',
+                                       'value' => 'p1.page_title',
                                        'rd_namespace',
                                        'rd_title',
                                        'rd_fragment',
                                        'rd_interwiki',
-                                       'p2.page_id AS redirid' ),
+                                       'redirid' => 'p2.page_id' ),
                        'conds' => array( 'p1.page_is_redirect' => 1 ),
                        'join_conds' => array( 'redirect' => array(
                                        'LEFT JOIN', 'rd_from=p1.page_id' ),
@@ -60,9 +69,12 @@ class ListredirectsPage extends QueryPage {
        function getOrderFields() {
                return array ( 'p1.page_namespace', 'p1.page_title' );
        }
-       
+
        /**
         * Cache page existence for performance
+        *
+        * @param $db DatabaseBase
+        * @param $res ResultWrapper
         */
        function preprocessResults( $db, $res ) {
                $batch = new LinkBatch;
@@ -78,7 +90,7 @@ class ListredirectsPage extends QueryPage {
                        $db->dataSeek( $res, 0 );
                }
        }
-       
+
        protected function getRedirectTarget( $row ) {
                if ( isset( $row->rd_title ) ) {
                        return Title::makeTitle( $row->rd_namespace,
@@ -87,17 +99,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(),
@@ -108,8 +118,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>";