fix for r36212: take care of the namespace too

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

diff --git a/includes/SpecialShortpages.php b/includes/SpecialShortpages.php
index 1467a44..2e7d24a 100644 (file)
--- a/includes/SpecialShortpages.php
+++ b/includes/SpecialShortpages.php
@@ -1,60 +1,88 @@
 <?php
 /**
- *
- * @package MediaWiki
- * @subpackage SpecialPage
+ * @file
+ * @ingroup SpecialPage
  */
 
-/**
- *
- */
-require_once("QueryPage.php");
-
 /**
  * SpecialShortpages extends QueryPage. It is used to return the shortest
  * pages in the database.
- * @package MediaWiki
- * @subpackage SpecialPage
+ * @ingroup SpecialPage
  */
 class ShortPagesPage extends QueryPage {
 
        function getName() {
-               return "Shortpages";
+               return 'Shortpages';
        }
 
+       /**
+        * This query is indexed as of 1.5
+        */
        function isExpensive() {
                return true;
        }
-       function isSyndicated() { return false; }
+
+       function isSyndicated() {
+               return false;
+       }
 
        function getSQL() {
-               $dbr =& wfGetDB( DB_SLAVE );
+               global $wgContentNamespaces;
+
+               $dbr = wfGetDB( DB_SLAVE );
                $page = $dbr->tableName( 'page' );
-               $text = $dbr->tableName( 'text' );
                $name = $dbr->addQuotes( $this->getName() );
-               
-               # FIXME: Not only is this teh suck, it will fail
-               # if we compress revisions on save as it will return
-               # the compressed size.
+
+               $forceindex = $dbr->useIndexClause("page_len");
+
+               if ($wgContentNamespaces)
+                       $nsclause = "page_namespace IN (" . $dbr->makeList($wgContentNamespaces) . ")";
+               else
+                       $nsclause = "page_namespace = " . NS_MAIN;
+
                return
                        "SELECT $name as type,
-                                       page_namespace as namespace,
+                               page_namespace as namespace,
                                page_title as title,
-                               LENGTH(old_text) AS value
-                       FROM $page, $text
-                       WHERE page_namespace=0 AND page_is_redirect=0
-                         AND page_latest=old_id";
+                               page_len AS value
+                       FROM $page $forceindex
+                       WHERE $nsclause AND page_is_redirect=0";
+       }
+
+       function preprocessResults( $db, $res ) {
+               # There's no point doing a batch check if we aren't caching results;
+               # the page must exist for it to have been pulled out of the table
+               if( $this->isCached() ) {
+                       $batch = new LinkBatch();
+                       while( $row = $db->fetchObject( $res ) )
+                               $batch->add( $row->namespace, $row->title );
+                       $batch->execute();
+                       if( $db->numRows( $res ) > 0 )
+                               $db->dataSeek( $res, 0 );
+               }
        }
-       
+
        function sortDescending() {
                return false;
        }
 
        function formatResult( $skin, $result ) {
                global $wgLang, $wgContLang;
-               $nb = wfMsg( "nbytes", $wgLang->formatNum( $result->value ) );
-               $link = $skin->makeKnownLink( $result->title, $wgContLang->convert( $result->title ) );
-               return "{$link} ({$nb})";
+               $dm = $wgContLang->getDirMark();
+
+               $title = Title::makeTitleSafe( $result->namespace, $result->title );
+               if ( !$title ) {
+                       return '<!-- Invalid title ' .  htmlspecialchars( "{$result->namespace}:{$result->title}" ). '-->';
+               }
+               $hlink = $skin->makeKnownLinkObj( $title, wfMsgHtml( 'hist' ), 'action=history' );
+               $plink = $this->isCached()
+                                       ? $skin->makeLinkObj( $title )
+                                       : $skin->makeKnownLinkObj( $title );
+               $size = wfMsgExt( 'nbytes', array( 'parsemag', 'escape' ), $wgLang->formatNum( htmlspecialchars( $result->value ) ) );
+
+               return $title->exists()
+                               ? "({$hlink}) {$dm}{$plink} {$dm}[{$size}]"
+                               : "<s>({$hlink}) {$dm}{$plink} {$dm}[{$size}]</s>";
        }
 }
 
@@ -68,5 +96,3 @@ function wfSpecialShortpages() {
 
        return $spp->doQuery( $offset, $limit );
 }
-
-?>