about summary refs log tree commit diff
path: root/app/views/shared/_og.html.haml
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2018-08-02 11:57:52 +0200
committerGitHub <noreply@github.com>2018-08-02 11:57:52 +0200
commitcf0f8eb742f1e5a7b0bbab261214ee5e9b9de6fe (patch)
tree29c156a7d145f2ec88e4bb708d329202598bdf35 /app/views/shared/_og.html.haml
parent71b318dedc5f39382cb15250417429427a69166b (diff)
parentbf1d3ae3b83726816c78ca6cb40af24d48390bd9 (diff)
Merge pull request #621 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
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'