From cd5cfc14969bbfc9a921be86227b1cc048d430db Mon Sep 17 00:00:00 2001
From: Mark VanLandingham <mark.vanlandingham@discourse.org>
Date: Mon, 29 Jun 2020 13:22:02 -0500
Subject: [PATCH] FEATURE: Site setting to always show category definitions
 (#10124)

---
 app/controllers/list_controller.rb | 4 +++-
 config/site_settings.yml           | 3 +++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/controllers/list_controller.rb b/app/controllers/list_controller.rb
index e635a8815d9..5f43378b5b7 100644
--- a/app/controllers/list_controller.rb
+++ b/app/controllers/list_controller.rb
@@ -52,7 +52,9 @@ class ListController < ApplicationController
       list_opts = build_topic_list_options
       list_opts.merge!(options) if options
       user = list_target_user
-      list_opts[:no_definitions] = true if params[:category].blank? && filter == :latest
+      if params[:category].blank? && filter == :latest && !SiteSetting.show_category_definitions_in_topic_lists
+        list_opts[:no_definitions] = true
+      end
 
       list = TopicQuery.new(user, list_opts).public_send("list_#{filter}")
 
diff --git a/config/site_settings.yml b/config/site_settings.yml
index 079232c0a93..557d7bdf81d 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -2034,6 +2034,9 @@ uncategorized:
   overridden_robots_txt:
     default: ""
     hidden: true
+  show_category_definitions_in_topic_lists:
+    default: false
+    hidden: true
 
 user_preferences:
   default_email_digest_frequency: