| Index: trunk/phase3/includes/ChangeTags.php |
| — | — | @@ -91,8 +91,12 @@ |
| 92 | 92 | * Needs $tables to be set up properly, so we can figure out which join conditions to use. |
| 93 | 93 | */ |
| 94 | 94 | static function modifyDisplayQuery( &$tables, &$fields, &$conds, &$join_conds, $filter_tag = false ) { |
| 95 | | - global $wgRequest; |
| | 95 | + global $wgRequest, $wgUseTagFilter; |
| 96 | 96 | |
| | 97 | + if( !$wgUseTagFilter ) { |
| | 98 | + return; |
| | 99 | + } |
| | 100 | + |
| 97 | 101 | if ($filter_tag === false) { |
| 98 | 102 | $filter_tag = $wgRequest->getVal( 'tagfilter' ); |
| 99 | 103 | } |
| — | — | @@ -129,8 +133,9 @@ |
| 130 | 134 | * If $fullForm is true, it returns an entire form. |
| 131 | 135 | */ |
| 132 | 136 | static function buildTagFilterSelector( $selected='', $fullForm = false /* used to put a full form around the selector */ ) { |
| 133 | | - |
| 134 | | - if ( !count( self::listDefinedTags() ) ) |
| | 137 | + global $wgUseTagFilter; |
| | 138 | + |
| | 139 | + if ( !$wgUseTagFilter || !count( self::listDefinedTags() ) ) |
| 135 | 140 | return $fullForm ? '' : array(); |
| 136 | 141 | |
| 137 | 142 | global $wgTitle; |
| Index: trunk/phase3/includes/DefaultSettings.php |
| — | — | @@ -3738,3 +3738,9 @@ |
| 3739 | 3739 | * Preprocessor caching threshold |
| 3740 | 3740 | */ |
| 3741 | 3741 | $wgPreprocessorCacheThreshold = 1000; |
| | 3742 | + |
| | 3743 | +/** |
| | 3744 | + * Allow filtering by change tag in recentchanges, history, etc |
| | 3745 | + * Has no effect if no tags are defined in valid_tag. |
| | 3746 | + */ |
| | 3747 | +$wgUseTagFilter = true; |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -118,6 +118,7 @@ |
| 119 | 119 | * Add an ID if 'missingsummary' is triggered to allow styling of the summary |
| 120 | 120 | line |
| 121 | 121 | * Add logging to password resets if not resetting your own |
| | 122 | +* Added $wgUseTagFilter to control enabling of filter-by-change-tag |
| 122 | 123 | |
| 123 | 124 | === Bug fixes in 1.15 === |
| 124 | 125 | * (bug 16968) Special:Upload no longer throws useless warnings. |