]> cat aescling's git repositories - mastodon.git/commitdiff
Fix user preference to show trends not working on public pages (#11740)
authorEugen Rochko <eugen@zeonfederated.com>
Tue, 3 Sep 2019 02:57:07 +0000 (04:57 +0200)
committerGitHub <noreply@github.com>
Tue, 3 Sep 2019 02:57:07 +0000 (04:57 +0200)
Fix #11738

app/views/application/_sidebar.html.haml

index 90c8f9dd1af3a2a4b0843d82e850cdfd5875d3e0..33e7c96fe75cbcb72c124c3ecc4ef8b60ed8ec6f 100644 (file)
@@ -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?