}
public static function checkStructuredFilterUiEnabled( Config $config, User $user ) {
- return (
- $config->get( 'StructuredChangeFiltersOnWatchlist' ) &&
- $user->getOption( 'rcenhancedfilters' )
- );
+ if ( !$config->get( 'StructuredChangeFiltersOnWatchlist' ) ) {
+ return false;
+ }
+
+ if ( $config->get( 'StructuredChangeFiltersShowWatchlistPreference' ) ) {
+ return !$user->getOption( 'wlenhancedfilters-disable' );
+ } else {
+ return $user->getOption( 'rcenhancedfilters' );
+ }
}
/**