* Fix explicit s-maxage=0 on raw pages; should help with proxy issues in

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

diff --git a/includes/SpecialWantedpages.php b/includes/SpecialWantedpages.php
index 428e3e9..f4a8f30 100644 (file)
--- a/includes/SpecialWantedpages.php
+++ b/includes/SpecialWantedpages.php
@@ -16,8 +16,11 @@ require_once 'QueryPage.php';
  * @subpackage SpecialPage
  */
 class WantedPagesPage extends QueryPage {
-       function WantedPagesPage( $inc = false ) {
+       var $nlinks;
+
+       function WantedPagesPage( $inc = false, $nlinks = true ) {
                $this->setListoutput( $inc );
+               $this->nlinks = $nlinks;
        }
 
        function getName() {
@@ -30,6 +33,8 @@ class WantedPagesPage extends QueryPage {
        function isSyndicated() { return false; }
 
        function getSQL() {
+               global $wgWantedPagesThreshold;
+               $count = $wgWantedPagesThreshold - 1;
                $dbr =& wfGetDB( DB_SLAVE );
                $pagelinks = $dbr->tableName( 'pagelinks' );
                $page      = $dbr->tableName( 'page' );
@@ -43,27 +48,25 @@ class WantedPagesPage extends QueryPage {
                         ON pl_namespace=page_namespace AND pl_title=page_title
                         WHERE page_namespace IS NULL
                         GROUP BY pl_namespace,pl_title
-                        HAVING COUNT(*) > 1";
+                        HAVING COUNT(*) > $count";
        }
 
        /**
         * Fetch user page links and cache their existence
         */
        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;
 
@@ -72,11 +75,11 @@ class WantedPagesPage extends QueryPage {
                $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() );
 
-               return "$plink ($nlink)";
+               return $this->nlinks ? "$plink ($nlink)" : $plink;
        }
 }
 
@@ -85,14 +88,18 @@ class WantedPagesPage extends QueryPage {
  */
 function wfSpecialWantedpages( $par = null, $specialPage ) {
        $inc = $specialPage->including();
-       
+
        if ( $inc ) {
-               $limit = (int)$par;
+               @list( $limit, $nlinks ) = explode( '/', $par, 2 );
+               $limit = (int)$limit;
+               $nlinks = $nlinks === 'nlinks';
                $offset = 0;
-       } else
+       } else {
                list( $limit, $offset ) = wfCheckLimits();
+               $nlinks = true;
+       }
 
-       $wpp = new WantedPagesPage( $inc );
+       $wpp = new WantedPagesPage( $inc, $nlinks );
 
        $wpp->doQuery( $offset, $limit, !$inc );
 }