Merge branch 'issue-138-html-escaping' into 'develop'

#138 - escape html entities in BIO text

See merge request pleroma/pleroma-fe!522
This commit is contained in:
Shpuld Shpludson 2019-02-05 15:24:31 +00:00
commit 8e51c78471

View file

@ -1,3 +1,5 @@
import { unescape } from 'lodash'
import TabSwitcher from '../tab_switcher/tab_switcher.js' import TabSwitcher from '../tab_switcher/tab_switcher.js'
import StyleSwitcher from '../style_switcher/style_switcher.vue' import StyleSwitcher from '../style_switcher/style_switcher.vue'
import fileSizeFormatService from '../../services/file_size_format/file_size_format.js' import fileSizeFormatService from '../../services/file_size_format/file_size_format.js'
@ -6,7 +8,7 @@ const UserSettings = {
data () { data () {
return { return {
newName: this.$store.state.users.currentUser.name, newName: this.$store.state.users.currentUser.name,
newBio: 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,
newDefaultScope: this.$store.state.users.currentUser.default_scope, newDefaultScope: this.$store.state.users.currentUser.default_scope,