about summary refs log tree commit diff
path: root/app/views/shared/_og.html.haml
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2018-07-31 18:59:34 +0200
committerGitHub <noreply@github.com>2018-07-31 18:59:34 +0200
commitcc56f2230a10c4fded80a34e5297fad8d9891e02 (patch)
treeb1bb13c698c8aeffc946da8a1f1025983ba58398 /app/views/shared/_og.html.haml
parent9ae53ad59ee18459775d19c4699c771c7f86fa7c (diff)
Add separate setting for sidebar text (site_short_description) (#8107)
* Add separate setting for sidebar text (site_short_description)

* Fix tests
Diffstat (limited to 'app/views/shared/_og.html.haml')
-rw-r--r--app/views/shared/_og.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/shared/_og.html.haml b/app/views/shared/_og.html.haml
index a6d805bea..76db511cd 100644
--- a/app/views/shared/_og.html.haml
+++ b/app/views/shared/_og.html.haml
@@ -3,7 +3,7 @@
 = opengraph 'og:url', url_for(only_path: false)
 = opengraph 'og:type', 'website'
 = opengraph 'og:title', @instance_presenter.site_title
-= opengraph 'og:description', strip_tags(@instance_presenter.site_description.presence || t('about.about_mastodon_html'))
+= opengraph 'og:description', strip_tags(@instance_presenter.site_short_description.presence || @instance_presenter.site_description.presence || t('about.about_mastodon_html'))
 = opengraph 'og:image', full_asset_url(thumbnail&.file&.url || asset_pack_path('preview.jpg', protocol: :request))
 = opengraph 'og:image:width', thumbnail ? thumbnail.meta['width'] : '1200'
 = opengraph 'og:image:height', thumbnail ? thumbnail.meta['height'] : '630'