about summary refs log tree commit diff
path: root/app/views/stream_entries/_og_image.html.haml
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2018-07-06 02:15:56 +0200
committerGitHub <noreply@github.com>2018-07-06 02:15:56 +0200
commitf89c595ea070d2017adb868fb5e311e198d8e990 (patch)
tree184c3ee83a0662b1438f2ee3a0cf02ab416e40eb /app/views/stream_entries/_og_image.html.haml
parent404c7702ec2a6576ef3b54f6a800624adfda9d53 (diff)
Add admin setting to enable OG previews for sensitive media (#7962)
Diffstat (limited to 'app/views/stream_entries/_og_image.html.haml')
-rw-r--r--app/views/stream_entries/_og_image.html.haml2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/stream_entries/_og_image.html.haml b/app/views/stream_entries/_og_image.html.haml
index 40530f567..e1b977da3 100644
--- a/app/views/stream_entries/_og_image.html.haml
+++ b/app/views/stream_entries/_og_image.html.haml
@@ -1,4 +1,4 @@
-- if activity.is_a?(Status) && activity.non_sensitive_with_media?
+- if activity.is_a?(Status) && (activity.non_sensitive_with_media? || (activity.with_media? && Setting.preview_sensitive_media))
   - player_card = false
   - activity.media_attachments.each do |media|
     - if media.image?