diff options
| author | Shpuld Shpludson <shp@cock.li> | 2022-01-09 18:37:01 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2022-01-09 18:37:01 +0000 |
| commit | b13d8f7e6339e877a38a28008630dc8ec64abcdf (patch) | |
| tree | 56e2103fcb52640a17847cb97a726f9d6d3198ee /src/components/basic_user_card/basic_user_card.vue | |
| parent | 51d3d8d255de221f7ac99e41f2f8e56c7d6a21a9 (diff) | |
| parent | 756f7bf7c2ee1beb7b43227271942130fd03c7cb (diff) | |
Merge branch 'develop' into 'master'
Update MASTER for 2.4.2
See merge request pleroma/pleroma-fe!1421
Diffstat (limited to 'src/components/basic_user_card/basic_user_card.vue')
| -rw-r--r-- | src/components/basic_user_card/basic_user_card.vue | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/components/basic_user_card/basic_user_card.vue b/src/components/basic_user_card/basic_user_card.vue index c53f6a9c..53deb1df 100644 --- a/src/components/basic_user_card/basic_user_card.vue +++ b/src/components/basic_user_card/basic_user_card.vue @@ -25,17 +25,11 @@ :title="user.name" class="basic-user-card-user-name" > - <!-- eslint-disable vue/no-v-html --> - <span - v-if="user.name_html" + <RichContent class="basic-user-card-user-name-value" - v-html="user.name_html" + :html="user.name" + :emoji="user.emoji" /> - <!-- eslint-enable vue/no-v-html --> - <span - v-else - class="basic-user-card-user-name-value" - >{{ user.name }}</span> </div> <div> <router-link |