From: Andrew Garrett <werdna@users.mediawiki.org>
Date: Tue, 24 Feb 2009 22:27:27 +0000 (+0000)
Subject: Make $wgUseTagFilter disable just filtering, rather than all display query modification
X-Git-Tag: 1.31.0-rc.0~42694
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/password.php?a=commitdiff_plain;h=f00675259d61f5842bbdcf73f5596d03763aed63;p=lhc%2Fweb%2Fwiklou.git

Make $wgUseTagFilter disable just filtering, rather than all display query modification
---

diff --git a/includes/ChangeTags.php b/includes/ChangeTags.php
index 9679aed2fb..7432086b9d 100644
--- a/includes/ChangeTags.php
+++ b/includes/ChangeTags.php
@@ -93,10 +93,6 @@ class ChangeTags {
 	static function modifyDisplayQuery( &$tables, &$fields,  &$conds, &$join_conds, $filter_tag = false ) {
 		global $wgRequest, $wgUseTagFilter;
 		
-		if( !$wgUseTagFilter ) {
-			return;
-		}
-		
 		if ($filter_tag === false) {
 			$filter_tag = $wgRequest->getVal( 'tagfilter' );
 		}
@@ -118,7 +114,7 @@ class ChangeTags {
 		$join_conds['tag_summary'] = array( 'LEFT JOIN', "ts_$join_cond=$join_cond" );
 		$fields[] = 'ts_tags';
 		
-		if ($filter_tag) {
+		if ($wgUseTagFilter && $filter_tag) {
 			// Somebody wants to filter on a tag.
 			// Add an INNER JOIN on change_tag