diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-09-05 11:36:41 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-09-05 11:36:41 +0200 |
| commit | 5088eb8388fbfcb210a518f918ae5332e6d3979e (patch) | |
| tree | 20b9394200b79e7eefc234cc50b0f3650e9afc1d /app/views/application | |
| parent | 0128509605ed90ee5a29d6af2347ab32bd46aeb9 (diff) | |
| parent | e265b8887dbd883bc7ca04832dc67ffe46966889 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/views/application')
| -rw-r--r-- | app/views/application/_sidebar.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
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? |