1 files changed, 68 insertions, 28 deletions

diff --git a/includes/specials/SpecialListredirects.php b/includes/specials/SpecialListredirects.php
index 315047da..acf5fbd9 100644
--- a/includes/specials/SpecialListredirects.php
+++ b/includes/specials/SpecialListredirects.php
@@ -30,22 +30,72 @@
  */
 class ListredirectsPage extends QueryPage {
 
-	function getName() { return( 'Listredirects' ); }
-	function isExpensive() { return( true ); }
-	function isSyndicated() { return( false ); }
-	function sortDescending() { return( false ); }
+	function __construct( $name = 'Listredirects' ) {
+		parent::__construct( $name );
+	}
+
+	function isExpensive() { return true; }
+	function isSyndicated() { return false; }
+	function sortDescending() { return false; }
 
-	function getSQL() {
-		$dbr = wfGetDB( DB_SLAVE );
-		$page = $dbr->tableName( 'page' );
-		$sql = "SELECT 'Listredirects' AS type, page_title AS title, page_namespace AS namespace, 
-			0 AS value FROM $page WHERE page_is_redirect = 1";
-		return( $sql );
+	function getQueryInfo() {
+		return array(
+			'tables' => array( 'p1' => 'page', 'redirect', 'p2' => 'page' ),
+			'fields' => array( 'p1.page_namespace AS namespace',
+					'p1.page_title AS title',
+					'rd_namespace',
+					'rd_title',
+					'rd_fragment',
+					'rd_interwiki',
+					'p2.page_id AS redirid' ),
+			'conds' => array( 'p1.page_is_redirect' => 1 ),
+			'join_conds' => array( 'redirect' => array(
+					'LEFT JOIN', 'rd_from=p1.page_id' ),
+				'p2' => array( 'LEFT JOIN', array(
+					'p2.page_namespace=rd_namespace',
+					'p2.page_title=rd_title' ) ) )
+		);
 	}
 
-	function formatResult( $skin, $result ) {
-		global $wgContLang;
+	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;
+		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 = new Article( $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(
@@ -56,25 +106,15 @@ class ListredirectsPage extends QueryPage {
 		);
 
 		# Find out where the redirect leads
-		$revision = Revision::newFromTitle( $rd_title );
-		if( $revision ) {
+		$target = $this->getRedirectTarget( $result );
+		if( $target ) {
+			global $wgLang;
 			# 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>";
-			}
+			$arr = $wgLang->getArrow() . $wgLang->getDirMark();
+			$targetLink = $skin->link( $target );
+			return "$rd_link $arr $targetLink";
 		} else {
 			return "<del>$rd_link</del>";
 		}
 	}
 }
-
-function wfSpecialListredirects() {
-	list( $limit, $offset ) = wfCheckLimits();
-	$lrp = new ListredirectsPage();
-	$lrp->doQuery( $offset, $limit );
-}