Stop profiling before ending the function

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

diff --git a/includes/SpecialShortpages.php b/includes/SpecialShortpages.php
index 0073f88..926f2c3 100644 (file)
--- a/includes/SpecialShortpages.php
+++ b/includes/SpecialShortpages.php
@@ -1,20 +1,18 @@
 <?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 {
 
        function getName() {
-               return "Shortpages";
+               return 'Shortpages';
        }
 
        /**
@@ -29,27 +27,35 @@ class ShortPagesPage extends QueryPage {
        }
 
        function getSQL() {
-               $dbr =& wfGetDB( DB_SLAVE );
+               global $wgContentNamespaces;
+
+               $dbr = wfGetDB( DB_SLAVE );
                $page = $dbr->tableName( 'page' );
                $name = $dbr->addQuotes( $this->getName() );
 
                $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_title as title,
                                page_len AS value
                        FROM $page $forceindex
-                       WHERE page_namespace=".NS_MAIN." AND page_is_redirect=0";
+                       WHERE $nsclause AND page_is_redirect=0";
        }
 
-       function preprocessResults( &$db, &$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 = $db->fetchObject( $res ) )
-                               $batch->addObj( Title::makeTitleSafe( $row->namespace, $row->title ) );
+                               $batch->add( $row->namespace, $row->title );
                        $batch->execute();
                        if( $db->numRows( $res ) > 0 )
                                $db->dataSeek( $res, 0 );
@@ -63,7 +69,7 @@ class ShortPagesPage extends QueryPage {
        function formatResult( $skin, $result ) {
                global $wgLang, $wgContLang;
                $dm = $wgContLang->getDirMark();
-               
+
                $title = Title::makeTitleSafe( $result->namespace, $result->title );
                if ( !$title ) {
                        return '<!-- Invalid title ' .  htmlspecialchars( "{$result->namespace}:{$result->title}" ). '-->';
@@ -72,8 +78,8 @@ class ShortPagesPage extends QueryPage {
                $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}]"
                                : "<s>({$hlink}) {$dm}{$plink} {$dm}[{$size}]</s>";
@@ -90,5 +96,3 @@ function wfSpecialShortpages() {
 
        return $spp->doQuery( $offset, $limit );
 }
-
-?>