From: Eugen Rochko <eugen@zeonfederated.com>
Date: Tue, 3 Sep 2019 02:57:07 +0000 (+0200)
Subject: Fix user preference to show trends not working on public pages (#11740)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=16c1abdb2d493012f0f0fd5eb36324d2f0cd91d9;p=mastodon.git

Fix user preference to show trends not working on public pages (#11740)

Fix #11738
---

diff --git a/app/views/application/_sidebar.html.haml b/app/views/application/_sidebar.html.haml
index 90c8f9dd1..33e7c96fe 100644
--- a/app/views/application/_sidebar.html.haml
+++ b/app/views/application/_sidebar.html.haml
@@ -5,7 +5,7 @@
   .hero-widget__text
     %p= @instance_presenter.site_short_description.html_safe.presence || @instance_presenter.site_description.html_safe.presence || t('about.generic_description', domain: site_hostname)
 
-- if Setting.trends
+- if Setting.trends && !(user_signed_in? && !current_user.setting_trends)
   - trends = TrendingTags.get(3)
 
   - unless trends.empty?