From: Andrew Garrett <werdna@users.mediawiki.org>
Date: Mon, 2 Mar 2009 14:27:25 +0000 (+0000)
Subject: Partial revert of r47930, accidentally included half-done changes
X-Git-Tag: 1.31.0-rc.0~42637
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=51f031758225b4736d83d96eff89f1d3ee2a79a7;p=lhc%2Fweb%2Fwiklou.git

Partial revert of r47930, accidentally included half-done changes
---

diff --git a/includes/specials/SpecialContributions.php b/includes/specials/SpecialContributions.php
index 874c38197d..64c65692db 100644
--- a/includes/specials/SpecialContributions.php
+++ b/includes/specials/SpecialContributions.php
@@ -398,12 +398,7 @@ class ContribsPager extends ReverseChronologicalPager {
 			'join_conds' => $join_cond
 		);
 		
-		ChangeTags::modifyDisplayQuery( $queryInfo['tables'],
-										$queryInfo['fields'],
-										$queryInfo['conds'],
-										$queryInfo['join_conds'],
-										$queryInfo['options'],
-										$this->tagFilter );
+		ChangeTags::modifyDisplayQuery( $queryInfo['tables'], $queryInfo['fields'], $queryInfo['conds'], $queryInfo['join_conds'], $this->tagFilter );
 		
 		wfRunHooks( 'ContribsPager::getQueryInfo', array( &$this, &$queryInfo ) );
 		return $queryInfo;
diff --git a/includes/specials/SpecialNewpages.php b/includes/specials/SpecialNewpages.php
index 886c41a254..9cf71777a3 100644
--- a/includes/specials/SpecialNewpages.php
+++ b/includes/specials/SpecialNewpages.php
@@ -438,12 +438,7 @@ class NewPagesPager extends ReverseChronologicalPager {
 		$fields = array();
 
 		## Modify query for tags
-		ChangeTags::modifyDisplayQuery( $info['tables'],
-										$fields,
-										$info['conds'],
-										$info['join_conds'],
-										$info['options'],
-										$this->opts['tagfilter'] );
+		ChangeTags::modifyDisplayQuery( $info['tables'], $fields, $info['conds'], $info['join_conds'], $this->opts['tagfilter'] );
 
 		return $info;
 	}
diff --git a/includes/specials/SpecialRecentchanges.php b/includes/specials/SpecialRecentchanges.php
index 3f5ca1257c..2fd7fe4a10 100644
--- a/includes/specials/SpecialRecentchanges.php
+++ b/includes/specials/SpecialRecentchanges.php
@@ -287,8 +287,7 @@ class SpecialRecentChanges extends SpecialPage {
 		}
 
 		// Tag stuff.
-		$fields = array();
-		// Fields are * in this case, so let the function modify an empty array to keep it happy.
+		$fields = array(); // Fields are * in this case, so let the function modify an empty array to keep it happy.
 		ChangeTags::modifyDisplayQuery( $tables, $fields, $conds, $join_conds, $opts['tagfilter'] );
 
 		wfRunHooks('SpecialRecentChangesQuery', array( &$conds, &$tables, &$join_conds, $opts ) );