about summary refs log tree commit diff
path: root/app/views/accounts
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2018-12-14 20:34:18 +0100
committerEugen Rochko <eugen@zeonfederated.com>2018-12-14 20:34:18 +0100
commit7c48688d85d0ab64501cea6b8a516867a786bb4c (patch)
tree90d06a2095d07892bfe724da313d21dfd0994833 /app/views/accounts
parent7241db299c7299770791a8674f4d7efde0faff6d (diff)
Make avatar and headers respect `auto_play_gif` (#9515)
* Do not animate account header art if user's GIF autoplay setting is off

Fixes #9472

* Honour currently logged-in user's GIF autoplay setting for account avatars

Fixes #9467

* Fix avatar display on some public pages when data is stored on a different host

* Use ternary operator instead of if/else for avatar/header URL
Diffstat (limited to 'app/views/accounts')
-rw-r--r--app/views/accounts/_header.html.haml7
1 files changed, 2 insertions, 5 deletions
diff --git a/app/views/accounts/_header.html.haml b/app/views/accounts/_header.html.haml
index 9ceae007d..370e7e470 100644
--- a/app/views/accounts/_header.html.haml
+++ b/app/views/accounts/_header.html.haml
@@ -1,12 +1,9 @@
 .public-account-header{:class => ("inactive" if account.moved?)}
   .public-account-header__image
-    = image_tag account.header.url, class: 'parallax'
+    = image_tag (current_account&.user&.setting_auto_play_gif ? account.header_original_url : account.header_static_url), class: 'parallax'
   .public-account-header__bar
     = link_to short_account_url(account), class: 'avatar' do
-      - if current_account&.user&.setting_auto_play_gif
-        = image_tag account.avatar_original_url
-      - else
-        = image_tag account.avatar_static_url
+      = image_tag (current_account&.user&.setting_auto_play_gif ? account.avatar_original_url : account.avatar_static_url)
     .public-account-header__tabs
       .public-account-header__tabs__name
         %h1