Addshore has uploaded a new change for review.
https://gerrit.wikimedia.org/r/267235
Change subject: Hide category changes if feature is disabled
......................................................................
Hide category changes if feature is disabled
Recently when RCWatchCategoryMembership was set
to false for many wikis suddenly all of the
category changes appeared in watchlists and in
recent changes.
This patch will avoid this and would instead
continue following the users settings
Change-Id: Id5468e8ef0ff430f03bacae708267a6ee6c84e48
---
M includes/specials/SpecialRecentchanges.php
M includes/specials/SpecialWatchlist.php
2 files changed, 2 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/35/267235/1
diff --git a/includes/specials/SpecialRecentchanges.php
b/includes/specials/SpecialRecentchanges.php
index f030231..0bf2485 100644
--- a/includes/specials/SpecialRecentchanges.php
+++ b/includes/specials/SpecialRecentchanges.php
@@ -84,10 +84,7 @@
$opts->add( 'hideliu', false );
$opts->add( 'hidepatrolled', $user->getBoolOption(
'hidepatrolled' ) );
$opts->add( 'hidemyself', false );
-
- if ( $config->get( 'RCWatchCategoryMembership' ) ) {
- $opts->add( 'hidecategorization', $user->getBoolOption(
'hidecategorization' ) );
- }
+ $opts->add( 'hidecategorization', $user->getBoolOption(
'hidecategorization' ) );
$opts->add( 'categories', '' );
$opts->add( 'categories_any', false );
diff --git a/includes/specials/SpecialWatchlist.php
b/includes/specials/SpecialWatchlist.php
index 6ebe9a8..cc5c150 100644
--- a/includes/specials/SpecialWatchlist.php
+++ b/includes/specials/SpecialWatchlist.php
@@ -118,10 +118,7 @@
$opts->add( 'hideliu', $user->getBoolOption( 'watchlisthideliu'
) );
$opts->add( 'hidepatrolled', $user->getBoolOption(
'watchlisthidepatrolled' ) );
$opts->add( 'hidemyself', $user->getBoolOption(
'watchlisthideown' ) );
-
- if ( $this->getConfig()->get( 'RCWatchCategoryMembership' ) ) {
- $opts->add( 'hidecategorization', $user->getBoolOption(
'watchlisthidecategorization' ) );
- }
+ $opts->add( 'hidecategorization', $user->getBoolOption(
'watchlisthidecategorization' ) );
return $opts;
}
--
To view, visit https://gerrit.wikimedia.org/r/267235
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id5468e8ef0ff430f03bacae708267a6ee6c84e48
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Addshore <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
