Use Doxygen @addtogroup instead of phpdoc @package && @subpackage

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

diff --git a/includes/SpecialShortpages.php b/includes/SpecialShortpages.php
index d8e13c7..be11df7 100644 (file)
--- a/includes/SpecialShortpages.php
+++ b/includes/SpecialShortpages.php
@@ -1,15 +1,13 @@
 <?php
 /**
  *
- * @package MediaWiki
- * @subpackage SpecialPage
+ * @addtogroup SpecialPage
  */
 
 /**
  * SpecialShortpages extends QueryPage. It is used to return the shortest
  * pages in the database.
- * @package MediaWiki
- * @subpackage SpecialPage
+ * @addtogroup SpecialPage
  */
 class ShortPagesPage extends QueryPage {
 
@@ -43,16 +41,16 @@ class ShortPagesPage extends QueryPage {
                        WHERE page_namespace=".NS_MAIN." AND page_is_redirect=0";
        }
 
-       function preprocessResults( &$dbo, $res ) {
+       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 = $dbo->fetchObject( $res ) )
+                       while( $row = $db->fetchObject( $res ) )
                                $batch->addObj( Title::makeTitleSafe( $row->namespace, $row->title ) );
                        $batch->execute();
-                       if( $dbo->numRows( $res ) > 0 )
-                               $dbo->dataSeek( $res, 0 );
+                       if( $db->numRows( $res ) > 0 )
+                               $db->dataSeek( $res, 0 );
                }
        }
 
@@ -65,11 +63,14 @@ class ShortPagesPage extends QueryPage {
                $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 = wfMsgHtml( 'nbytes', $wgLang->formatNum( htmlspecialchars( $result->value ) ) );
+               $size = wfMsgExt( 'nbytes', array( 'parsemag', 'escape' ), $wgLang->formatNum( htmlspecialchars( $result->value ) ) );
                
                return $title->exists()
                                ? "({$hlink}) {$dm}{$plink} {$dm}[{$size}]"