logo

pleroma-fe

My custom branche(s) on git.pleroma.social/pleroma/pleroma-fe
commit: 8e51c7847148c6e8e9488fd5e8ac17a9b0bc6290
parent: 5974dfebfb764c94acea04b64f072f1d37f4e1c9
Author: Shpuld Shpludson <shp@cock.li>
Date:   Tue,  5 Feb 2019 15:24:31 +0000

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

#138 - escape html entities in BIO text

See merge request pleroma/pleroma-fe!522

Diffstat:

Msrc/components/user_settings/user_settings.js4+++-
1 file changed, 3 insertions(+), 1 deletion(-)

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