From: Chad Horohoe <demon@users.mediawiki.org>
Date: Thu, 5 Mar 2009 13:52:14 +0000 (+0000)
Subject: (bug 17795) Make meta=siteinfo respect $wgDisableCounters.
X-Git-Tag: 1.31.0-rc.0~42601
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=77487253896dca491eceaf6ac16c8a27dff91c80;p=lhc%2Fweb%2Fwiklou.git

(bug 17795) Make meta=siteinfo respect $wgDisableCounters.
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 35d484dfc9..f2430b1189 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -280,6 +280,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 13209) Added rvdiffto parameter to prop=revisions
 * Manual language conversion improve: Now we can include both ";" and ":" in
   conversion rules
+* (bug 17795) Don't report views count on meta=siteinfo if $wgDisableCounters 
+  is set
 
 === Languages updated in 1.15 ===
 
diff --git a/includes/api/ApiQuerySiteinfo.php b/includes/api/ApiQuerySiteinfo.php
index 348b02b1c3..02c8a7c932 100644
--- a/includes/api/ApiQuerySiteinfo.php
+++ b/includes/api/ApiQuerySiteinfo.php
@@ -282,10 +282,13 @@ class ApiQuerySiteinfo extends ApiQueryBase {
 	}
 
 	protected function appendStatistics( $property ) {
+		global $wgDisableCounters;
 		$data = array();
 		$data['pages'] = intval( SiteStats::pages() );
 		$data['articles'] = intval( SiteStats::articles() );
-		$data['views'] = intval( SiteStats::views() );
+		if ( !$wgDisableCounters ) {
+			$data['views'] = intval( SiteStats::views() );
+		}
 		$data['edits'] = intval( SiteStats::edits() );
 		$data['images'] = intval( SiteStats::images() );
 		$data['users'] = intval( SiteStats::users() );