pleroma-fe

commit: 814ba88f1c9ad6104a53acadf529f827503ec3a7
parent: 8c465719cc542cdee57cc80393e7c0943228004b
Author: Shpuld Shpludson <shp@cock.li>
Date:   Thu, 29 Aug 2019 17:10:18 +0000

Merge branch 'fix-user-avatar-fallback' into 'develop'

Fix broken user avatar fallback logic

See merge request pleroma/pleroma-fe!933
Diffstat:
M
src/components/user_avatar/user_avatar.js
2
+-
M
src/components/user_avatar/user_avatar.vue
2
+-

2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/components/user_avatar/user_avatar.js b/src/components/user_avatar/user_avatar.js
@@ -16,7 +16,7 @@ const UserAvatar = {
   },
   computed: {
     imgSrc () {
-      return this.showPlaceholder ? '/images/avi.png' : this.src
+      return this.showPlaceholder ? '/images/avi.png' : this.user.profile_image_url_original
     }
   },
   methods: {
diff --git a/src/components/user_avatar/user_avatar.vue b/src/components/user_avatar/user_avatar.vue
@@ -3,7 +3,7 @@
     class="avatar"
     :alt="user.screen_name"
     :title="user.screen_name"
-    :src="user.profile_image_url_original"
+    :src="imgSrc"
     :class="{ 'avatar-compact': compact, 'better-shadow': betterShadow }"
     :image-load-error="imageLoadError"
   />