diff options
| author | Shpuld Shpludson <shp@cock.li> | 2020-11-11 20:58:47 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2020-11-11 20:58:47 +0000 |
| commit | fb5d3d32927cd9ad625203c84e8826a3544fda3e (patch) | |
| tree | 5b87324d2fbd357905f75875e9c8c15b780de32f | |
| parent | 1d2ba946b6b81dc225d0eec21548a737ca2fac5e (diff) | |
| parent | 3e1c828ba9e3a20bbb613ffa3982516c35c3321d (diff) | |
Merge branch 'develop' into 'fix/timeline-error-handling-fixes'
# Conflicts:
# CHANGELOG.md
| -rw-r--r-- | CHANGELOG.md | 1 | ||||
| -rw-r--r-- | index.html | 1 | ||||
| -rw-r--r-- | src/components/user_profile/user_profile.vue | 7 | ||||
| -rw-r--r-- | src/services/entity_normalizer/entity_normalizer.service.js | 2 |
4 files changed, 5 insertions, 6 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index a6b62bfe..18c1cf3b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/). ### Changed - Errors when fetching are now shown with popup errors instead of "Error fetching updates" in panel headers +- Fixed custom emoji not working in profile field names ## [2.2.0] - 2020-11-06 @@ -3,7 +3,6 @@ <head> <meta charset="utf-8"> <meta name="viewport" content="width=device-width, initial-scale=1,user-scalable=no"> - <title>Pleroma</title> <!--server-generated-meta--> <link rel="icon" type="image/png" href="/favicon.png"> </head> diff --git a/src/components/user_profile/user_profile.vue b/src/components/user_profile/user_profile.vue index f1f51840..745e795d 100644 --- a/src/components/user_profile/user_profile.vue +++ b/src/components/user_profile/user_profile.vue @@ -20,14 +20,13 @@ :key="index" class="user-profile-field" > + <!-- eslint-disable vue/no-v-html --> <dt :title="user.fields_text[index].name" class="user-profile-field-name" @click.prevent="linkClicked" - > - {{ field.name }} - </dt> - <!-- eslint-disable vue/no-v-html --> + v-html="field.name" + /> <dd :title="user.fields_text[index].value" class="user-profile-field-value" diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js index 9d09b8d0..a4c1a1bf 100644 --- a/src/services/entity_normalizer/entity_normalizer.service.js +++ b/src/services/entity_normalizer/entity_normalizer.service.js @@ -53,7 +53,7 @@ export const parseUser = (data) => { output.fields = data.fields output.fields_html = data.fields.map(field => { return { - name: addEmojis(field.name, data.emojis), + name: addEmojis(escape(field.name), data.emojis), value: addEmojis(field.value, data.emojis) } }) |