Merge branch 'fix/escape-display-name' into 'develop'
entity_normalizer: Escape name when parsing user See merge request pleroma/pleroma-fe!1415
This commit is contained in:
commit
ea0887a15e
2 changed files with 4 additions and 3 deletions
|
@ -24,7 +24,7 @@ library.add(
|
||||||
const ProfileTab = {
|
const ProfileTab = {
|
||||||
data () {
|
data () {
|
||||||
return {
|
return {
|
||||||
newName: this.$store.state.users.currentUser.name,
|
newName: this.$store.state.users.currentUser.name_unescaped,
|
||||||
newBio: unescape(this.$store.state.users.currentUser.description),
|
newBio: unescape(this.$store.state.users.currentUser.description),
|
||||||
newLocked: this.$store.state.users.currentUser.locked,
|
newLocked: this.$store.state.users.currentUser.locked,
|
||||||
newNoRichText: this.$store.state.users.currentUser.no_rich_text,
|
newNoRichText: this.$store.state.users.currentUser.no_rich_text,
|
||||||
|
|
|
@ -55,8 +55,9 @@ export const parseUser = (data) => {
|
||||||
}
|
}
|
||||||
|
|
||||||
output.emoji = data.emojis
|
output.emoji = data.emojis
|
||||||
output.name = data.display_name
|
output.name = escape(data.display_name)
|
||||||
output.name_html = escape(data.display_name)
|
output.name_html = output.name
|
||||||
|
output.name_unescaped = data.display_name
|
||||||
|
|
||||||
output.description = data.note
|
output.description = data.note
|
||||||
// TODO cleanup this shit, output.description is overriden with source data
|
// TODO cleanup this shit, output.description is overriden with source data
|
||||||
|
|
Loading…
Reference in a new issue