github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-20 13:46:31 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: We shouldn't include topics when mobile view is enabled

Browse Source 
This setting was set to be the opposite of what we want
This commit is contained in:
Robin Ward 2018-11-01 14:47:06 -04:00
parent ec91450aae
commit 2feadcdafb
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

@ -307,11 +307,11 @@ class CategoriesController < ApplicationController
def include_topics(parent_category = nil)
style = SiteSetting.desktop_category_page_style
view_context.mobile_view? ||
params[:include_topics] ||
!view_context.mobile_view? &&
(params[:include_topics] ||
(parent_category && parent_category.subcategory_list_includes_topics?) ||
style == "categories_with_featured_topics".freeze ||
style == "categories_boxes_with_topics".freeze ||
style == "categories_with_top_topics".freeze
style == "categories_with_top_topics".freeze)
end
end