From: Reedy <reedy@wikimedia.org>
Date: Tue, 17 Jul 2012 21:16:15 +0000 (+0100)
Subject: Only query page_counter if $wgDisableCounters is false
X-Git-Tag: 1.31.0-rc.0~23025
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/banques/%7B%7B%20url_for%28%27admin_users%27%29%20%7D%7D?a=commitdiff_plain;h=9555ff9f9a51b5064a2af2afdf3a34fac08fa3ed;p=lhc%2Fweb%2Fwiklou.git

Only query page_counter if $wgDisableCounters is false

Change-Id: Ie134090cdd6573d11a7f5510e1d90dab9b06f117
---

diff --git a/includes/actions/InfoAction.php b/includes/actions/InfoAction.php
index 543beb79a5..b74996cf97 100644
--- a/includes/actions/InfoAction.php
+++ b/includes/actions/InfoAction.php
@@ -114,8 +114,8 @@ class InfoAction extends FormlessAction {
 			'watchlist',
 			'COUNT(*)',
 			array(
+				'wl_namespace' => $title->getNamespace(),
 				'wl_title'     => $title->getDBkey(),
-				'wl_namespace' => $title->getNamespace()
 			),
 			__METHOD__
 		);
@@ -133,15 +133,20 @@ class InfoAction extends FormlessAction {
 			array( 'rev_page' => $id ),
 			__METHOD__
 		);
+		$result = array( 'watchers' => $watchers, 'edits' => $edits,
+			'authors' => $authors );
 
-		$views = (int)$dbr->selectField(
-			'page',
-			'page_counter',
-			array( 'page_id' => $id ),
-			__METHOD__
-		);
-
-		return array( 'watchers' => $watchers, 'edits' => $edits,
-			'authors' => $authors, 'views' => $views );
+		global $wgDisableCounters;
+		if ( !$wgDisableCounters ) {
+			$views = (int)$dbr->selectField(
+				'page',
+				'page_counter',
+				array( 'page_id' => $id ),
+				__METHOD__
+			);
+			$result['views'] = $views;
+		}
+
+		return $result;
 	}
 }