diff options
| author | Eugen <eugen@zeonfederated.com> | 2017-04-13 16:00:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-13 16:00:20 +0200 |
| commit | 1a5a54eb4b93fd16d9a0d158919b1936abe39227 (patch) | |
| tree | 79c9576e9f164eddb8cce9e585b2e4514ae44d1c /app/views/stream_entries | |
| parent | d2c20936f35f140ea4d8600cfac1d452c33acdd2 (diff) | |
| parent | 447b8bc44eb33ae6ffdfbcc7ae52fbe0bba93ece (diff) | |
Merge branch 'master' into master
Diffstat (limited to 'app/views/stream_entries')
| -rw-r--r-- | app/views/stream_entries/show.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/stream_entries/show.html.haml b/app/views/stream_entries/show.html.haml index f37fb7919..862946750 100644 --- a/app/views/stream_entries/show.html.haml +++ b/app/views/stream_entries/show.html.haml @@ -11,7 +11,7 @@ - else %meta{ property: 'og:description', content: @stream_entry.activity.content }/ - - if @stream_entry.activity.is_a?(Status) && @stream_entry.activity.media_attachments.size > 0 + - if @stream_entry.activity.is_a?(Status) && !@stream_entry.activity.sensitive? && @stream_entry.activity.media_attachments.size > 0 %meta{ property: 'og:image', content: full_asset_url(@stream_entry.activity.media_attachments.first.file.url(:small)) }/ - else %meta{ property: 'og:image', content: full_asset_url(@account.avatar.url(:original)) }/ |