Revert r34906, r34907, r34928 -- mixing high-level data into low-level storage functi...

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

diff --git a/includes/SpecialListredirects.php b/includes/SpecialListredirects.php
index f717ef7..5ff2851 100644 (file)
--- a/includes/SpecialListredirects.php
+++ b/includes/SpecialListredirects.php
@@ -1,7 +1,6 @@
 <?php
 /**
- * @package MediaWiki
- * @subpackage SpecialPage
+ * @addtogroup SpecialPage
  *
  * @author Rob Church <robchur@gmail.com>
  * @copyright © 2006 Rob Church
@@ -9,10 +8,9 @@
  */
 
 /**
- * @package MediaWiki
- * @subpackage SpecialPage
+ * Special:Listredirects - Lists all the redirects on the wiki.
+ * @addtogroup SpecialPage
  */
-
 class ListredirectsPage extends QueryPage {
 
        function getName() { return( 'Listredirects' ); }
@@ -21,7 +19,7 @@ class ListredirectsPage extends QueryPage {
        function sortDescending() { return( false ); }
 
        function getSQL() {
-               $dbr =& wfGetDB( DB_SLAVE );
+               $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 );
@@ -29,11 +27,10 @@ class ListredirectsPage extends QueryPage {
 
        function formatResult( $skin, $result ) {
                global $wgContLang;
-       
+
                # Make a link to the redirect itself
                $rd_title = Title::makeTitle( $result->namespace, $result->title );
-               $arr = $wgContLang->getArrow() . $wgContLang->getDirMark();
-               $rd_link = $skin->makeKnownLinkObj( $rd_title, '', 'redirect=no' );
+               $rd_link = $skin->makeLinkObj( $rd_title, '', 'redirect=no' );
 
                # Find out where the redirect leads
                $revision = Revision::newFromTitle( $rd_title );
@@ -41,21 +38,16 @@ class ListredirectsPage extends QueryPage {
                        # Make a link to the destination page
                        $target = Title::newFromRedirect( $revision->getText() );
                        if( $target ) {
+                               $arr = $wgContLang->getArrow() . $wgContLang->getDirMark();
                                $targetLink = $skin->makeLinkObj( $target );
+                               return "$rd_link $arr $targetLink";
                        } else {
-                               /** @todo Put in some decent error display here */
-                               $targetLink = '*';
+                               return "<s>$rd_link</s>";
                        }
                } else {
-                       /** @todo Put in some decent error display here */
-                       $targetLink = '*';
+                       return "<s>$rd_link</s>";
                }
-
-               # Format the whole thing and return it
-               return "$rd_link $arr $targetLink";
-
        }
-
 }
 
 function wfSpecialListredirects() {
@@ -63,5 +55,3 @@ function wfSpecialListredirects() {
        $lrp = new ListredirectsPage();
        $lrp->doQuery( $offset, $limit );
 }
-
-?>