From ae21194691f574748cc4b296f401a4005697d997 Mon Sep 17 00:00:00 2001 From: addshore Date: Fri, 29 Jan 2016 12:42:04 +0100 Subject: [PATCH] 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 --- includes/specials/SpecialRecentchanges.php | 5 +---- includes/specials/SpecialWatchlist.php | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/includes/specials/SpecialRecentchanges.php b/includes/specials/SpecialRecentchanges.php index f030231e77..0bf24853c9 100644 --- a/includes/specials/SpecialRecentchanges.php +++ b/includes/specials/SpecialRecentchanges.php @@ -84,10 +84,7 @@ class SpecialRecentChanges extends ChangesListSpecialPage { $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 6ebe9a8074..cc5c1506d3 100644 --- a/includes/specials/SpecialWatchlist.php +++ b/includes/specials/SpecialWatchlist.php @@ -118,10 +118,7 @@ class SpecialWatchlist extends ChangesListSpecialPage { $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; } -- 2.20.1