From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Thu, 8 Mar 2007 22:27:32 +0000 (+0000)
Subject: * Respect $wgContentNamespaces, patch by Jim R. Wilson (bug 9231)
X-Git-Tag: 1.31.0-rc.0~53847
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dmes_infos.php?a=commitdiff_plain;h=224de864fe7056913f8581f5b08641147745f439;p=lhc%2Fweb%2Fwiklou.git

* Respect $wgContentNamespaces, patch by Jim R. Wilson (bug 9231)
---

diff --git a/includes/SpecialPopularpages.php b/includes/SpecialPopularpages.php
index a4e509b33d..e0e4a47d42 100644
--- a/includes/SpecialPopularpages.php
+++ b/includes/SpecialPopularpages.php
@@ -24,13 +24,25 @@ class PopularPagesPage extends QueryPage {
 		$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 ) {