Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix logic for when to include topics in category list

This commit is contained in:
Régis Hanol 2016-08-22 23:11:08 +02:00
parent 9573e28df9
commit d06e2793aa
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/categories_controller.rb
View File

@ -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,