Skip to content

Commit

Permalink
Merge pull request #22454 from nextcloud/bugfix/noid/fix_double_escap…
Browse files Browse the repository at this point in the history
…ing_status_dashboard

Fix double escape of user-status in Dashboard widget
  • Loading branch information
rullzer authored Aug 27, 2020
2 parents 2c6c5fe + 67bbfda commit 1a312c4
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions apps/user_status/js/dashboard.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion apps/user_status/js/dashboard.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion apps/user_status/src/views/Dashboard.vue
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ export default {
subText = this.t('user_status', '{status}, {timestamp}', {
status,
timestamp: moment(item.timestamp, 'X').fromNow(),
})
}, null, { escape: false, sanitize: false })
} else {
subText = status
}
Expand Down

0 comments on commit 1a312c4

Please sign in to comment.