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

Revert "Merge branch 'master' of https://github.com/discourse/discourse"

Browse Source 
This reverts commit e62a85cf6fd81a2a34aff6144bd36b9ac459964a, reversing
changes made to 2660c2e21d84bea667e1ea339f91cda352328062.
This commit is contained in:
Jeff Atwood
2020-05-22 20:25:56 -07:00
parent e62a85cf6f
commit 20780a1eee
236 changed files with 717 additions and 1033 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/controllers/list_controller.rb
View File

@ -331,13 +331,7 @@ class ListController < ApplicationController
params[:category] = @category.id.to_s
@description_meta = if @category.uncategorized?
I18n.t('category.uncategorized_description', locale: SiteSetting.default_locale)
else
@category.description_text
end
@description_meta = SiteSetting.site_description if @description_meta.blank?
@description_meta = @category.description_text
if !guardian.can_see?(@category)
if SiteSetting.detailed_404
raise Discourse::InvalidAccess