Bug 40668 - "Return to Array." when logging in

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

diff --git a/includes/specials/SpecialListredirects.php b/includes/specials/SpecialListredirects.php
index 8504662..f4acd64 100644 (file)
--- a/includes/specials/SpecialListredirects.php
+++ b/includes/specials/SpecialListredirects.php
@@ -33,19 +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',
-                                       'p2.page_id AS redirid' ),
+                                       'rd_fragment',
+                                       'rd_interwiki',
+                                       'redirid' => 'p2.page_id' ),
                        'conds' => array( 'p1.page_is_redirect' => 1 ),
                        'join_conds' => array( 'redirect' => array(
                                        'LEFT JOIN', 'rd_from=p1.page_id' ),
@@ -59,12 +70,44 @@ class ListredirectsPage extends QueryPage {
                return array ( 'p1.page_namespace', 'p1.page_title' );
        }
 
-       function formatResult( $skin, $result ) {
-               global $wgContLang;
+       /**
+        * Cache page existence for performance
+        *
+        * @param $db DatabaseBase
+        * @param $res ResultWrapper
+        */
+       function preprocessResults( $db, $res ) {
+               $batch = new LinkBatch;
+               foreach ( $res as $row ) {
+                       $batch->add( $row->namespace, $row->title );
+                       $batch->addObj( $this->getRedirectTarget( $row ) );
+               }
+               $batch->execute();
 
+               // Back to start for display
+               if ( $db->numRows( $res ) > 0 ) {
+                       // If there are no rows we get an error seeking.
+                       $db->dataSeek( $res, 0 );
+               }
+       }
+
+       protected function getRedirectTarget( $row ) {
+               if ( isset( $row->rd_title ) ) {
+                       return Title::makeTitle( $row->rd_namespace,
+                               $row->rd_title, $row->rd_fragment,
+                               $row->rd_interwiki
+                       );
+               } else {
+                       $title = Title::makeTitle( $row->namespace, $row->title );
+                       $article = WikiPage::factory( $title );
+                       return $article->getRedirectTarget();
+               }
+       }
+
+       function formatResult( $skin, $result ) {
                # 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(),
@@ -72,17 +115,13 @@ class ListredirectsPage extends QueryPage {
                );
 
                # Find out where the redirect leads
-               $revision = Revision::newFromTitle( $rd_title );
-               if( $revision ) {
+               $target = $this->getRedirectTarget( $result );
+               if( $target ) {
                        # Make a link to the destination page
-                       $target = Title::newFromRedirect( $revision->getText() );
-                       if( $target ) {
-                               $arr = $wgContLang->getArrow() . $wgContLang->getDirMark();
-                               $targetLink = $skin->link( $target );
-                               return "$rd_link $arr $targetLink";
-                       } else {
-                               return "<del>$rd_link</del>";
-                       }
+                       $lang = $this->getLanguage();
+                       $arr = $lang->getArrow() . $lang->getDirMark();
+                       $targetLink = Linker::link( $target );
+                       return "$rd_link $arr $targetLink";
                } else {
                        return "<del>$rd_link</del>";
                }