Handle multiple warnings correctly in ApiBase::setWarning(). Calling this function...

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

diff --git a/includes/SpecialWantedpages.php b/includes/SpecialWantedpages.php
index 100c6c0..c14cce1 100644 (file)
--- a/includes/SpecialWantedpages.php
+++ b/includes/SpecialWantedpages.php
@@ -1,19 +1,12 @@
 <?php
 /**
- *
- * @package MediaWiki
- * @subpackage SpecialPage
+ * @file
+ * @ingroup SpecialPage
  */
 
 /**
- *
- */
-require_once 'QueryPage.php';
-
-/**
- *
- * @package MediaWiki
- * @subpackage SpecialPage
+ * implements Special:Wantedpages
+ * @ingroup SpecialPage
  */
 class WantedPagesPage extends QueryPage {
        var $nlinks;
@@ -35,7 +28,7 @@ class WantedPagesPage extends QueryPage {
        function getSQL() {
                global $wgWantedPagesThreshold;
                $count = $wgWantedPagesThreshold - 1;
-               $dbr =& wfGetDB( DB_SLAVE );
+               $dbr = wfGetDB( DB_SLAVE );
                $pagelinks = $dbr->tableName( 'pagelinks' );
                $page      = $dbr->tableName( 'page' );
                return
@@ -49,18 +42,19 @@ class WantedPagesPage extends QueryPage {
                         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 pl_namespace, pl_title
+                        GROUP BY 1,2,3
                         HAVING COUNT(*) > $count";
        }
 
        /**
         * Cache page existence for performance
         */
-       function preprocessResults( &$db, &$res ) {
+       function preprocessResults( $db, $res ) {
                $batch = new LinkBatch;
                while ( $row = $db->fetchObject( $res ) )
-                       $batch->addObj( Title::makeTitleSafe( $row->namespace, $row->title ) );
+                       $batch->add( $row->namespace, $row->title );
                $batch->execute();
 
                // Back to start for display
@@ -69,46 +63,50 @@ class WantedPagesPage extends QueryPage {
                        $db->dataSeek( $res, 0 );
        }
 
-
-       function formatResult( $skin, $result ) {
-               global $wgContLang;
-
+       /**
+        * Format an individual result
+        *
+        * @param Skin $skin Skin to use for UI elements
+        * @param object $result Result row
+        * @return string
+        */
+       public function formatResult( $skin, $result ) {
                $title = Title::makeTitleSafe( $result->namespace, $result->title );
-
-               if( $this->isCached() ) {
-                       # Check existence; which is stored in the link cache
-                       if( !$title->exists() ) {
-                               # Make a redlink
-                               $pageLink = $skin->makeBrokenLinkObj( $title );
+               if( $title instanceof Title ) {
+                       if( $this->isCached() ) {
+                               $pageLink = $title->exists()
+                                       ? '<s>' . $skin->makeLinkObj( $title ) . '</s>'
+                                       : $skin->makeBrokenLinkObj( $title );
                        } else {
-                               # Make a struck-out blue link
-                               $pageLink = "<s>" . $skin->makeKnownLinkObj( $title ) . "</s>";
-                       }               
+                               $pageLink = $skin->makeBrokenLinkObj( $title );
+                       }
+                       return wfSpecialList( $pageLink, $this->makeWlhLink( $title, $skin, $result ) );
                } else {
-                       # Not cached? Don't bother checking existence; it can't
-                       $pageLink = $skin->makeBrokenLinkObj( $title );
+                       $tsafe = htmlspecialchars( $result->title );
+                       return "Invalid title in result set; {$tsafe}";
                }
-               
-               # Make a link to "what links here" if it's required
-               $wlhLink = $this->nlinks
-                                       ? $this->makeWlhLink( $title, $skin, wfMsgHtml( 'nlinks', $result->value ) )
-                                       : "";
-                                       
-               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
+        * Make a "what links here" link for a specified result if required
+        *
+        * @param Title $title Title to make the link for
+        * @param Skin $skin Skin to use
+        * @param object $result Result row
         * @return string
         */
-       function makeWlhLink( &$title, &$skin, $text ) {
-               $wlhTitle = Title::makeTitle( NS_SPECIAL, 'Whatlinkshere' );
-               return $skin->makeKnownLinkObj( $wlhTitle, $text, 'target=' . $title->getPrefixedUrl() );               
+       private function makeWlhLink( $title, $skin, $result ) {
+               global $wgLang;
+               if( $this->nlinks ) {
+                       $wlh = SpecialPage::getTitleFor( 'Whatlinkshere' );
+                       $label = wfMsgExt( 'nlinks', array( 'parsemag', 'escape' ),
+                               $wgLang->formatNum( $result->value ) );
+                       return $skin->makeKnownLinkObj( $wlh, $label, 'target=' . $title->getPrefixedUrl() );
+               } else {
+                       return null;
+               }
        }
-       
+
 }
 
 /**
@@ -131,5 +129,3 @@ function wfSpecialWantedpages( $par = null, $specialPage ) {
 
        $wpp->doQuery( $offset, $limit, !$inc );
 }
-
-?>