diff options
| author | Christian Schmidt <github@chsc.dk> | 2023-03-06 15:37:19 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-06 15:37:19 +0100 |
| commit | c4cf92094ec3cc065df2b05c76352dcb72020777 (patch) | |
| tree | 224cc53a4bf02777f9c2de602743e91432936a64 /app/views | |
| parent | dfa9843ac85d04e1facb2f757fd9288d8bb9fb2c (diff) | |
Do not strip tags from `Setting.site_short_description` (#23975)
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/application/_sidebar.html.haml | 2 | ||||
| -rw-r--r-- | app/views/shared/_og.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/application/_sidebar.html.haml b/app/views/application/_sidebar.html.haml index 6d18668b0..9d0efa7e1 100644 --- a/app/views/application/_sidebar.html.haml +++ b/app/views/application/_sidebar.html.haml @@ -3,7 +3,7 @@ = image_tag @instance_presenter.thumbnail&.file&.url(:'@1x') || asset_pack_path('media/images/preview.png'), alt: @instance_presenter.title .hero-widget__text - %p= @instance_presenter.description.html_safe.presence || t('about.about_mastodon_html') + %p= @instance_presenter.description.presence || t('about.about_mastodon_html') - if Setting.trends && !(user_signed_in? && !current_user.setting_trends) - trends = Trends.tags.query.allowed.limit(3) diff --git a/app/views/shared/_og.html.haml b/app/views/shared/_og.html.haml index 2941b566e..a5d99ae33 100644 --- a/app/views/shared/_og.html.haml +++ b/app/views/shared/_og.html.haml @@ -1,5 +1,5 @@ - thumbnail = @instance_presenter.thumbnail -- description ||= strip_tags(@instance_presenter.description.presence || t('about.about_mastodon_html')) +- description ||= @instance_presenter.description.presence || strip_tags(t('about.about_mastodon_html')) %meta{ name: 'description', content: description }/ |