API: Requesting a token you aren't allowed to request no longer dies with an error...

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

diff --git a/includes/SpecialPopularpages.php b/includes/SpecialPopularpages.php
index ca96168..eb57273 100644 (file)
--- a/includes/SpecialPopularpages.php
+++ b/includes/SpecialPopularpages.php
@@ -1,19 +1,12 @@
 <?php
 /**
- *
- * @package MediaWiki
- * @subpackage SpecialPage
+ * @file
+ * @ingroup SpecialPage
  */
 
 /**
- *
- */
-require_once( "QueryPage.php" );
-
-/**
- *
- * @package MediaWiki
- * @subpackage SpecialPage
+ * implements Special:Popularpages
+ * @ingroup SpecialPage
  */
 class PopularPagesPage extends QueryPage {
 
@@ -22,29 +15,43 @@ class PopularPagesPage extends QueryPage {
        }
 
        function isExpensive() {
-               # cur_counter is not indexed
+               # page_counter is not indexed
                return true;
        }
        function isSyndicated() { return false; }
 
        function getSQL() {
-               $dbr =& wfGetDB( DB_SLAVE );
-               $cur = $dbr->tableName( 'cur' );
+               $dbr = wfGetDB( DB_SLAVE );
+               $page = $dbr->tableName( 'page' );
 
-               return
+               $query =
                        "SELECT 'Popularpages' as type,
-                               cur_namespace as namespace,
-                               cur_title as title,
-                               cur_counter as value
-                       FROM $cur
-                       WHERE cur_namespace=0 AND cur_is_redirect=0";
+                               page_namespace as namespace,
+                               page_title as title,
+                               page_counter as value
+                       FROM $page ";
+               $where =
+                       "WHERE page_is_redirect=0 AND page_namespace";
+
+               global $wgContentNamespaces;
+               if( empty( $wgContentNamespaces ) ) {
+                       $where .= '='.NS_MAIN;
+               } else if( count( $wgContentNamespaces ) > 1 ) {
+                       $where .= ' in (' . implode( ', ', $wgContentNamespaces ) . ')';
+               } else {
+                       $where .= '='.$wgContentNamespaces[0];
+               }
+
+               return $query . $where;
        }
 
        function formatResult( $skin, $result ) {
                global $wgLang, $wgContLang;
-               $link = $skin->makeKnownLink( $result->title, $wgContLang->convert( $result->title ) );
-               $nv = wfMsg( "nviews", $wgLang->formatNum( $result->value ) );
-               return "{$link} ({$nv})";
+               $title = Title::makeTitle( $result->namespace, $result->title );
+               $link = $skin->makeKnownLinkObj( $title, htmlspecialchars( $wgContLang->convert( $title->getPrefixedText() ) ) );
+               $nv = wfMsgExt( 'nviews', array( 'parsemag', 'escape'),
+                       $wgLang->formatNum( $result->value ) );
+               return wfSpecialList($link, $nv);
        }
 }
 
@@ -52,11 +59,9 @@ class PopularPagesPage extends QueryPage {
  * Constructor
  */
 function wfSpecialPopularpages() {
-    list( $limit, $offset ) = wfCheckLimits();
-    
-    $ppp = new PopularPagesPage();
-    
-    return $ppp->doQuery( $offset, $limit );
-}
+       list( $limit, $offset ) = wfCheckLimits();
 
-?>
+       $ppp = new PopularPagesPage();
+
+       return $ppp->doQuery( $offset, $limit );
+}