Merge "Add a class to interlanguage links"

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

diff --git a/includes/specials/SpecialListredirects.php b/includes/specials/SpecialListredirects.php
index 24888c0..de05be4 100644 (file)
--- a/includes/specials/SpecialListredirects.php
+++ b/includes/specials/SpecialListredirects.php
@@ -29,7 +29,6 @@
  * @ingroup SpecialPage
  */
 class ListredirectsPage extends QueryPage {
-
        function __construct( $name = 'Listredirects' ) {
                parent::__construct( $name );
        }
@@ -50,16 +49,16 @@ class ListredirectsPage extends QueryPage {
                return array(
                        'tables' => array( 'p1' => 'page', 'redirect', 'p2' => 'page' ),
                        'fields' => array( 'namespace' => 'p1.page_namespace',
-                                       'title' => 'p1.page_title',
-                                       'value' => 'p1.page_title',
-                                       'rd_namespace',
-                                       'rd_title',
-                                       'rd_fragment',
-                                       'rd_interwiki',
-                                       'redirid' => 'p2.page_id' ),
+                               'title' => 'p1.page_title',
+                               'value' => 'p1.page_title',
+                               'rd_namespace',
+                               'rd_title',
+                               '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' ),
+                               'LEFT JOIN', 'rd_from=p1.page_id' ),
                                'p2' => array( 'LEFT JOIN', array(
                                        'p2.page_namespace=rd_namespace',
                                        'p2.page_title=rd_title' ) ) )
@@ -77,6 +76,10 @@ class ListredirectsPage extends QueryPage {
         * @param ResultWrapper $res
         */
        function preprocessResults( $db, $res ) {
+               if ( !$res->numRows() ) {
+                       return;
+               }
+
                $batch = new LinkBatch;
                foreach ( $res as $row ) {
                        $batch->add( $row->namespace, $row->title );
@@ -85,10 +88,7 @@ class ListredirectsPage extends QueryPage {
                $batch->execute();
 
                // Back to start for display
-               if ( $res->numRows() > 0 ) {
-                       // If there are no rows we get an error seeking.
-                       $db->dataSeek( $res, 0 );
-               }
+               $res->seek( 0 );
        }
 
        protected function getRedirectTarget( $row ) {
@@ -100,6 +100,7 @@ class ListredirectsPage extends QueryPage {
                } else {
                        $title = Title::makeTitle( $row->namespace, $row->title );
                        $article = WikiPage::factory( $title );
+
                        return $article->getRedirectTarget();
                }
        }
@@ -121,11 +122,12 @@ class ListredirectsPage extends QueryPage {
 
                # Find out where the redirect leads
                $target = $this->getRedirectTarget( $result );
-               if( $target ) {
+               if ( $target ) {
                        # Make a link to the destination page
                        $lang = $this->getLanguage();
                        $arr = $lang->getArrow() . $lang->getDirMark();
                        $targetLink = Linker::link( $target );
+
                        return "$rd_link $arr $targetLink";
                } else {
                        return "<del>$rd_link</del>";