Partial revert of r47930, accidentally included half-done changes

diff --git a/includes/specials/SpecialContributions.php b/includes/specials/SpecialContributions.php
index 874c381..64c6569 100644 (file)
--- 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 886c41a..9cf7177 100644 (file)
--- 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 3f5ca12..2fd7fe4 100644 (file)
--- 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 ) );