* (bug 10181) Support the XCache object caching mechanism [patch from Kurt Radwanski]

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

diff --git a/includes/SpecialPopularpages.php b/includes/SpecialPopularpages.php
index fc84826..cd2f60e 100644 (file)
--- a/includes/SpecialPopularpages.php
+++ b/includes/SpecialPopularpages.php
@@ -5,7 +5,7 @@
  */
 
 /**
- *
+ * implements Special:Popularpages
  * @addtogroup SpecialPage
  */
 class PopularPagesPage extends QueryPage {
@@ -21,16 +21,28 @@ class PopularPagesPage extends QueryPage {
        function isSyndicated() { return false; }
 
        function getSQL() {
-               $dbr =& wfGetDB( DB_SLAVE );
+               $dbr = wfGetDB( DB_SLAVE );
                $page = $dbr->tableName( 'page' );
 
-               return
+               $query = 
                        "SELECT 'Popularpages' as type,
                                page_namespace as namespace,
                                page_title as title,
                                page_counter as value
-                       FROM $page
-                       WHERE page_namespace=".NS_MAIN." AND page_is_redirect=0";
+                       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 ) {
@@ -47,11 +59,11 @@ class PopularPagesPage extends QueryPage {
  * Constructor
  */
 function wfSpecialPopularpages() {
-    list( $limit, $offset ) = wfCheckLimits();
+       list( $limit, $offset ) = wfCheckLimits();
 
-    $ppp = new PopularPagesPage();
+       $ppp = new PopularPagesPage();
 
-    return $ppp->doQuery( $offset, $limit );
+       return $ppp->doQuery( $offset, $limit );
 }
 
 ?>