From d06e2793aa2c802bcc53a6c2a49aa99062da52c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Mon, 22 Aug 2016 23:11:08 +0200 Subject: [PATCH] fix logic for when to include topics in category list --- app/controllers/categories_controller.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rb index 883c0774f53..324a798c4a9 100644 --- a/app/controllers/categories_controller.rb +++ b/app/controllers/categories_controller.rb @@ -16,9 +16,9 @@ class CategoriesController < ApplicationController @description = SiteSetting.site_description - include_topics = view_context.mobile_view? - include_topics ||= SiteSetting.category_page_style == "categories_with_featured_topics".freeze - include_topics ||= params[:include_topics] + include_topics = view_context.mobile_view? || + params[:include_topics] || + SiteSetting.category_page_style == "categories_with_featured_topics".freeze category_options = { is_homepage: current_homepage == "categories".freeze,