* (bug 10117) Special:Wantedpages doesn't handle invalid titles in result - now print...

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

diff --git a/includes/SpecialWantedpages.php b/includes/SpecialWantedpages.php
index 742113e..7afa3de 100644 (file)
--- a/includes/SpecialWantedpages.php
+++ b/includes/SpecialWantedpages.php
@@ -1,19 +1,12 @@
 <?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;
@@ -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,15 +37,19 @@ 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 ) {
                $batch = new LinkBatch;
@@ -64,21 +63,51 @@ class WantedPagesPage extends QueryPage {
                        $db->dataSeek( $res, 0 );
        }
 
-
-       function formatResult( $skin, $result ) {
-               global $wgContLang;
-
-               $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() );
-
-               return $this->nlinks ? "$plink ($nlink)" : $plink;
+       /**
+        * 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 ) {
+               global $wgLang;
+               $title = Title::makeTitleSafe( $result->namespace, $result->title );
+               if( $title instanceof Title ) {
+                       if( $this->isCached() ) {
+                               $pageLink = $title->exists()
+                                       ? '<s>' . $skin->makeLinkObj( $title ) . '</s>'
+                                       : $skin->makeBrokenLinkObj( $title );
+                       } else {
+                               $pageLink = $skin->makeBrokenLinkObj( $title );
+                       }
+                       return wfSpecialList( $pageLink, $this->makeWlhLink( $title, $skin, $result ) );
+               } else {
+                       $tsafe = htmlspecialchars( $result->title );
+                       return "Invalid title in result set; {$tsafe}";
+               }
+       }
+       
+       /**
+        * 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
+        */
+       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;
+               }
        }
+       
 }
 
 /**