API bug 10046: incorrect action produces invalid response format

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

diff --git a/includes/SpecialWantedpages.php b/includes/SpecialWantedpages.php
index bccd6e4..8b70020 100644 (file)
--- a/includes/SpecialWantedpages.php
+++ b/includes/SpecialWantedpages.php
@@ -1,23 +1,16 @@
 <?php
 /**
  *
- * @package MediaWiki
- * @subpackage SpecialPage
+ * @addtogroup SpecialPage
  */
 
 /**
- *
- */
-require_once 'QueryPage.php';
-
-/**
- *
- * @package MediaWiki
- * @subpackage SpecialPage
+ * implements Special:Wantedpages
+ * @addtogroup SpecialPage
  */
 class WantedPagesPage extends QueryPage {
        var $nlinks;
-       
+
        function WantedPagesPage( $inc = false, $nlinks = true ) {
                $this->setListoutput( $inc );
                $this->nlinks = $nlinks;
@@ -33,7 +26,9 @@ class WantedPagesPage extends QueryPage {
        function isSyndicated() { return false; }
 
        function getSQL() {
-               $dbr =& wfGetDB( DB_SLAVE );
+               global $wgWantedPagesThreshold;
+               $count = $wgWantedPagesThreshold - 1;
+               $dbr = wfGetDB( DB_SLAVE );
                $pagelinks = $dbr->tableName( 'pagelinks' );
                $page      = $dbr->tableName( 'page' );
                return
@@ -42,45 +37,74 @@ class WantedPagesPage extends QueryPage {
                                pl_title AS title,
                                COUNT(*) AS value
                         FROM $pagelinks
-                        LEFT JOIN $page
-                        ON pl_namespace=page_namespace AND pl_title=page_title
-                        WHERE page_namespace IS NULL
-                        GROUP BY pl_namespace,pl_title
-                        HAVING COUNT(*) > 1";
+                        LEFT JOIN $page AS pg1
+                        ON pl_namespace = pg1.page_namespace AND pl_title = pg1.page_title
+                        LEFT JOIN $page AS pg2
+                        ON pl_from = pg2.page_id
+                        WHERE pg1.page_namespace IS NULL
+                        AND pl_namespace NOT IN ( 2, 3 )
+                        AND pg2.page_namespace != 8
+                        GROUP BY 1,2,3
+                        HAVING COUNT(*) > $count";
        }
 
        /**
-        * Fetch user page links and cache their existence
+        * Cache page existence for performance
         */
        function preprocessResults( &$db, &$res ) {
-               global $wgLinkCache;
-
                $batch = new LinkBatch;
                while ( $row = $db->fetchObject( $res ) )
-                       $batch->addObj( Title::makeTitleSafe( NS_USER, $row->title ) );
-               $batch->execute( $wgLinkCache );
+                       $batch->addObj( Title::makeTitleSafe( $row->namespace, $row->title ) );
+               $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 );
        }
-       
-       
+
+
        function formatResult( $skin, $result ) {
-               global $wgContLang;
+               global $wgLang;
 
-               $nt = Title::makeTitle( $result->namespace, $result->title );
-               $text = $wgContLang->convert( $nt->getPrefixedText() );
-               $plink = $this->isCached() ?
-                       $skin->makeLinkObj( $nt, $text ) :
-                       $skin->makeBrokenLink( $nt->getPrefixedText(), $text );
-               
-               $nl = wfMsg( 'nlinks', $result->value );
-               $nlink = $skin->makeKnownLink( $wgContLang->specialPage( 'Whatlinkshere' ), $nl, 'target=' . $nt->getPrefixedURL() );
+               $title = Title::makeTitleSafe( $result->namespace, $result->title );
 
-               return $this->nlinks ? "$plink ($nlink)" : $plink;
+               if( $this->isCached() ) {
+                       # Check existence; which is stored in the link cache
+                       if( !$title->exists() ) {
+                               # Make a redlink
+                               $pageLink = $skin->makeBrokenLinkObj( $title );
+                       } else {
+                               # Make a a struck-out normal link
+                               $pageLink = "<s>" . $skin->makeLinkObj( $title ) . "</s>";
+                       }               
+               } else {
+                       # Not cached? Don't bother checking existence; it can't
+                       $pageLink = $skin->makeBrokenLinkObj( $title );
+               }
+               
+               # Make a link to "what links here" if it's required
+               $wlhLink = $this->nlinks
+                                       ? $this->makeWlhLink( $title, $skin,
+                                                       wfMsgExt( 'nlinks', array( 'parsemag', 'escape'),
+                                                               $wgLang->formatNum( $result->value ) ) )
+                                       : null;
+                                       
+               return wfSpecialList($pageLink, $wlhLink);
+       }
+       
+       /**
+        * Make a "what links here" link for a specified title
+        * @param $title Title to make the link for
+        * @param $skin Skin to use
+        * @param $text Link text
+        * @return string
+        */
+       function makeWlhLink( &$title, &$skin, $text ) {
+               $wlhTitle = SpecialPage::getTitleFor( 'Whatlinkshere' );
+               return $skin->makeKnownLinkObj( $wlhTitle, $text, 'target=' . $title->getPrefixedUrl() );
        }
+       
 }
 
 /**
@@ -88,7 +112,7 @@ class WantedPagesPage extends QueryPage {
  */
 function wfSpecialWantedpages( $par = null, $specialPage ) {
        $inc = $specialPage->including();
-       
+
        if ( $inc ) {
                @list( $limit, $nlinks ) = explode( '/', $par, 2 );
                $limit = (int)$limit;