From addf9d62f89de10cea0beb6195dd744e70d35c85 Mon Sep 17 00:00:00 2001 From: Joffrey JAFFEUX Date: Mon, 11 May 2020 16:45:28 +0200 Subject: [PATCH] FIX: prevents rendering topic-category if empty (#9720) --- app/controllers/topics_controller.rb | 2 ++ app/views/topics/show.html.erb | 12 ++++-------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb index 2d93468185b..954369af278 100644 --- a/app/controllers/topics_controller.rb +++ b/app/controllers/topics_controller.rb @@ -1012,6 +1012,8 @@ class TopicsController < ApplicationController respond_to do |format| format.html do + @tags = SiteSetting.tagging_enabled ? @topic_view.topic.tags : [] + @breadcrumbs = helpers.categories_breadcrumb(@topic_view.topic) || [] @description_meta = @topic_view.topic.excerpt.present? ? @topic_view.topic.excerpt : @topic_view.summary store_preloaded("topic_#{@topic_view.topic.id}", MultiJson.dump(topic_view_serializer)) render :show diff --git a/app/views/topics/show.html.erb b/app/views/topics/show.html.erb index 801e0a09730..2c6f27155a5 100644 --- a/app/views/topics/show.html.erb +++ b/app/views/topics/show.html.erb @@ -4,9 +4,8 @@ <%= render_topic_title(@topic_view.topic) %> -
- <% @breadcrumbs = categories_breadcrumb(@topic_view.topic) %> - <% if @breadcrumbs.present? %> + <% if @breadcrumbs.present? || @tags.present? %> + +
+ <% end %> <%= server_plugin_outlet "topic_header" %>