Merge "[FileBackend] Improved connection error handling and logging a bit for Swift."

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

diff --git a/includes/specials/SpecialShortpages.php b/includes/specials/SpecialShortpages.php
index 9bc1bc4..8622b92 100644 (file)
--- a/includes/specials/SpecialShortpages.php
+++ b/includes/specials/SpecialShortpages.php
@@ -45,7 +45,7 @@ class ShortPagesPage extends QueryPage {
                                        'page_len AS value' ),
                        'conds' => array ( 'page_namespace' => NS_MAIN,
                                        'page_is_redirect' => 0 ),
-                       'options' => array ( 'USE INDEX' => 'page_redirect_namespaces_len' )
+                       'options' => array ( 'USE INDEX' => 'page_redirect_namespace_len' )
                );
        }
 
@@ -61,16 +61,17 @@ class ShortPagesPage extends QueryPage {
        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();
-                       foreach ( $res as $row ) {
-                               $batch->add( $row->namespace, $row->title );
-                       }
-                       $batch->execute();
-                       if ( $db->numRows( $res ) > 0 ) {
-                               $db->dataSeek( $res, 0 );
-                       }
+               if ( !$this->isCached() || !$res->numRows() ) {
+                       return;
                }
+
+               $batch = new LinkBatch();
+               foreach ( $res as $row ) {
+                       $batch->add( $row->namespace, $row->title );
+               }
+               $batch->execute();
+
+               $res->seek( 0 );
        }
 
        function sortDescending() {
@@ -81,22 +82,27 @@ class ShortPagesPage extends QueryPage {
                $dm = $this->getLanguage()->getDirMark();
 
                $title = Title::makeTitle( $result->namespace, $result->title );
-               if ( !$title ) {
-                       return '<!-- Invalid title ' .  htmlspecialchars( "{$result->namespace}:{$result->title}" ). '-->';
-               }
+
                $hlink = Linker::linkKnown(
                        $title,
-                       wfMsgHtml( 'hist' ),
+                       $this->msg( 'hist' )->escaped(),
                        array(),
                        array( 'action' => 'history' )
                );
-               $plink = $this->isCached()
-                                       ? Linker::link( $title )
-                                       : Linker::linkKnown( $title );
+               $hlinkInParentheses = $this->msg( 'parentheses' )->rawParams( $hlink )->escaped();
+
+               if ( $this->isCached() ) {
+                       $plink = Linker::link( $title );
+                       $exists = $title->exists();
+               } else {
+                       $plink = Linker::linkKnown( $title );
+                       $exists = true;
+               }
+
                $size = $this->msg( 'nbytes' )->numParams( $result->value )->escaped();
 
-               return $title->exists()
-                               ? "({$hlink}) {$dm}{$plink} {$dm}[{$size}]"
-                               : "<del>({$hlink}) {$dm}{$plink} {$dm}[{$size}]</del>";
+               return $exists
+                               ? "${hlinkInParentheses} {$dm}{$plink} {$dm}[{$size}]"
+                               : "<del>${hlinkInParentheses} {$dm}{$plink} {$dm}[{$size}]</del>";
        }
 }