Merge "fixed timestamp validation for api"

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

diff --git a/includes/specials/SpecialMostlinked.php b/includes/specials/SpecialMostlinked.php
index 73dd4f0..66814cb 100644 (file)
--- a/includes/specials/SpecialMostlinked.php
+++ b/includes/specials/SpecialMostlinked.php
@@ -36,19 +36,24 @@ class MostlinkedPage extends QueryPage {
                parent::__construct( $name );
        }
 
-       function isExpensive() { return true; }
-       function isSyndicated() { return false; }
+       function isExpensive() {
+               return true;
+       }
+
+       function isSyndicated() {
+               return false;
+       }
 
        function getQueryInfo() {
                return array (
                        'tables' => array ( 'pagelinks', 'page' ),
-                       'fields' => array ( 'pl_namespace AS namespace',
-                                       'pl_title AS title',
-                                       'COUNT(*) AS value',
+                       'fields' => array ( 'namespace' => 'pl_namespace',
+                                       'title' => 'pl_title',
+                                       'value' => 'COUNT(*)',
                                        'page_namespace' ),
                        'options' => array ( 'HAVING' => 'COUNT(*) > 1',
-                               'GROUP BY' => 'pl_namespace, pl_title, '.
-                                               'page_namespace' ),
+                               'GROUP BY' => array( 'pl_namespace', 'pl_title',
+                                               'page_namespace' ) ),
                        'join_conds' => array ( 'page' => array ( 'LEFT JOIN',
                                        array ( 'page_namespace = pl_namespace',
                                                'page_title = pl_title' ) ) )
@@ -57,14 +62,17 @@ class MostlinkedPage extends QueryPage {
 
        /**
         * Pre-fill the link cache
+        *
+        * @param $db DatabaseBase
+        * @param $res
         */
        function preprocessResults( $db, $res ) {
-               if( $db->numRows( $res ) > 0 ) {
+               if ( $res->numRows() > 0 ) {
                        $linkBatch = new LinkBatch();
                        foreach ( $res as $row ) {
                                $linkBatch->add( $row->namespace, $row->title );
                        }
-                       $db->dataSeek( $res, 0 );
+                       $res->seek( 0 );
                        $linkBatch->execute();
                }
        }
@@ -74,12 +82,11 @@ class MostlinkedPage extends QueryPage {
         *
         * @param $title Title being queried
         * @param $caption String: text to display on the link
-        * @param $skin Skin to use
         * @return String
         */
-       function makeWlhLink( &$title, $caption, &$skin ) {
+       function makeWlhLink( $title, $caption ) {
                $wlh = SpecialPage::getTitleFor( 'Whatlinkshere', $title->getPrefixedDBkey() );
-               return $skin->linkKnown( $wlh, $caption );
+               return Linker::linkKnown( $wlh, $caption );
        }
 
        /**
@@ -90,15 +97,14 @@ class MostlinkedPage extends QueryPage {
         * @return string
         */
        function formatResult( $skin, $result ) {
-               global $wgLang;
                $title = Title::makeTitleSafe( $result->namespace, $result->title );
                if ( !$title ) {
-                       return '<!-- ' . htmlspecialchars( "Invalid title: [[$title]]" ) . ' -->';
+                       return Html::element( 'span', array( 'class' => 'mw-invalidtitle' ),
+                               Linker::getInvalidTitleDescription( $this->getContext(), $result->namespace, $result->title ) );
                }
-               $link = $skin->link( $title );
+               $link = Linker::link( $title );
                $wlh = $this->makeWlhLink( $title,
-                       wfMsgExt( 'nlinks', array( 'parsemag', 'escape'),
-                               $wgLang->formatNum( $result->value ) ), $skin );
-               return wfSpecialList( $link, $wlh );
+                       $this->msg( 'nlinks' )->numParams( $result->value )->escaped() );
+               return $this->getLanguage()->specialList( $link, $wlh );
        }
 }