A little refactoring of the input splitting/expansion:

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

diff --git a/includes/SpecialShortpages.php b/includes/SpecialShortpages.php
index 6867b80..973656d 100644 (file)
--- a/includes/SpecialShortpages.php
+++ b/includes/SpecialShortpages.php
@@ -1,20 +1,13 @@
 <?php
 /**
  *
- * @package MediaWiki
- * @subpackage SpecialPage
+ * @addtogroup SpecialPage
  */
 
-/**
- *
- */
-require_once("QueryPage.php");
-
 /**
  * SpecialShortpages extends QueryPage. It is used to return the shortest
  * pages in the database.
- * @package MediaWiki
- * @subpackage SpecialPage
+ * @addtogroup SpecialPage
  */
 class ShortPagesPage extends QueryPage {
 
@@ -34,7 +27,7 @@ class ShortPagesPage extends QueryPage {
        }
 
        function getSQL() {
-               $dbr =& wfGetDB( DB_SLAVE );
+               $dbr = wfGetDB( DB_SLAVE );
                $page = $dbr->tableName( 'page' );
                $name = $dbr->addQuotes( $this->getName() );
 
@@ -48,17 +41,40 @@ class ShortPagesPage extends QueryPage {
                        WHERE page_namespace=".NS_MAIN." 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->addObj( Title::makeTitleSafe( $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 = wfMsgExt( 'nbytes', array('parsemag', 'escape'), $wgLang->formatNum( $result->value ) );
-               $title = Title::makeTitle( $result->namespace, $result->title );
-               $link = $skin->makeKnownLinkObj( $title, htmlspecialchars( $wgContLang->convert( $title->getPrefixedText() ) ) );
-               $histlink = $skin->makeKnownLinkObj( $title, wfMsgHtml('hist'), 'action=history' );
-               return "({$histlink}) $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>";
        }
 }
 
@@ -73,4 +89,4 @@ function wfSpecialShortpages() {
        return $spp->doQuery( $offset, $limit );
 }
 
-?>
+