github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-04 07:56:01 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit 2feadcdafb5095024b1403246e6ae5e5fd017830.
This commit is contained in:
Robin Ward
2018-11-02 10:29:44 -04:00
parent 4417faa7e5
commit 931c3d165b
1 changed files with 3 additions and 3 deletions
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) def include_topics(parent_category = nil)
style = SiteSetting.desktop_category_page_style style = SiteSetting.desktop_category_page_style
!view_context.mobile_view? && view_context.mobile_view? ||
(params[:include_topics] || params[:include_topics] ||
(parent_category && parent_category.subcategory_list_includes_topics?) || (parent_category && parent_category.subcategory_list_includes_topics?) ||
style == "categories_with_featured_topics".freeze || style == "categories_with_featured_topics".freeze ||
style == "categories_boxes_with_topics".freeze || style == "categories_boxes_with_topics".freeze ||
style == "categories_with_top_topics".freeze) style == "categories_with_top_topics".freeze
end end
end end