From caa669cf2955a659f94c4a19eb0d677c09b8af3a Mon Sep 17 00:00:00 2001 From: Sam Date: Mon, 23 Jul 2018 17:23:00 +1000 Subject: [PATCH] FIX: if exclude_category_ids is specified pass it through This allows us to optionally show all topics on latest even if stuff is suppressed via a plugin --- app/controllers/list_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/list_controller.rb b/app/controllers/list_controller.rb index 8339d8b2d3e..6deaf817e7d 100644 --- a/app/controllers/list_controller.rb +++ b/app/controllers/list_controller.rb @@ -64,7 +64,7 @@ class ListController < ApplicationController if filter == :latest list_opts[:no_definitions] = true end - if [:latest, :categories].include?(filter) + if [:latest, :categories].include?(filter) && list_opts[:exclude_category_ids].blank? list_opts[:exclude_category_ids] = get_excluded_category_ids(list_opts[:category]) end end @@ -264,7 +264,7 @@ class ListController < ApplicationController top_options.merge!(options) if options top_options[:per_page] = SiteSetting.topics_per_period_in_top_page - if "top".freeze == current_homepage + if "top".freeze == current_homepage && top_options[:exclude_category_ids].blank? top_options[:exclude_category_ids] = get_excluded_category_ids(top_options[:category]) end