Merge branch 'develop' into 'fix/timeline-error-handling-fixes'

# Conflicts: # CHANGELOG.md
2020-11-11 20:58:47 +00:00 · 2020-11-11 20:58:47 +00:00 · fb5d3d3292
parent 1d2ba946b6 3e1c828ba9
commit fb5d3d3292
4 changed files with 5 additions and 6 deletions
--- 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
--- a/index.html
+++ b/index.html
@ -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>
--- 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"
--- 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)
      }
    })