diff options
| author | Shpuld Shpludson <shp@cock.li> | 2019-02-05 15:24:31 +0000 |
|---|---|---|
| committer | Shpuld Shpludson <shp@cock.li> | 2019-02-05 15:24:31 +0000 |
| commit | 8e51c7847148c6e8e9488fd5e8ac17a9b0bc6290 (patch) | |
| tree | bc8fc5770887965f02850fb1c41b4602772af1e4 /src/components/user_settings/user_settings.js | |
| parent | 5974dfebfb764c94acea04b64f072f1d37f4e1c9 (diff) | |
| parent | 94fdc2d583b7c7c3aa2e92375cd0370fedc6bbda (diff) | |
Merge branch 'issue-138-html-escaping' into 'develop'
#138 - escape html entities in BIO text
See merge request pleroma/pleroma-fe!522
Diffstat (limited to 'src/components/user_settings/user_settings.js')
| -rw-r--r-- | src/components/user_settings/user_settings.js | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/components/user_settings/user_settings.js b/src/components/user_settings/user_settings.js index 9bd8aa00..df757dfb 100644 --- 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, |