diff options
| author | Shpuld Shpludson <shp@cock.li> | 2019-08-29 17:10:18 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2019-08-29 17:10:18 +0000 |
| commit | 814ba88f1c9ad6104a53acadf529f827503ec3a7 (patch) | |
| tree | 4d4a7d6ad0a35e020b8dc9485043981f55563af3 /src/components | |
| parent | 8c465719cc542cdee57cc80393e7c0943228004b (diff) | |
| parent | 9476fbba5a4b18562d24bd643ab7dfba60364c11 (diff) | |
Merge branch 'fix-user-avatar-fallback' into 'develop'
Fix broken user avatar fallback logic
See merge request pleroma/pleroma-fe!933
Diffstat (limited to 'src/components')
| -rw-r--r-- | src/components/user_avatar/user_avatar.js | 2 | ||||
| -rw-r--r-- | 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 index a42b9c71..4adf8211 100644 --- 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 index 811efd3c..9ffb28d8 100644 --- 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" /> |