upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-23 10:37:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Merge pull request #29598 from nextcloud/backport/29029/stable22

Browse source 
[stable22] Fix HTML entity rendering in file comments sidebar
This commit is contained in:
Carl Schwan 2021-11-09 11:19:51 +01:00 committed by GitHub
commit 4d34ccd88c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 24 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
apps/comments/js/comments-app.js
View file

File diff suppressed because one or more lines are too long

2
apps/comments/js/comments-app.js.map
View file

File diff suppressed because one or more lines are too long

19
apps/comments/src/services/GetComments.js
View file

@ -74,6 +74,23 @@ function processMultistatus(result, isDetailed = false) {
const {
propstat: { prop: props },
} = item
return prepareFileFromProps(props, props.id.toString(), isDetailed)
// Decode HTML entities
const decodedProps = {
...props,
// Decode twice to handle potentially double-encoded entities
// FIXME Remove this once https://github.com/nextcloud/server/issues/29306 is resolved
actorDisplayName: decodeHtmlEntities(props.actorDisplayName, 2),
message: decodeHtmlEntities(props.message, 2),
}
return prepareFileFromProps(decodedProps, decodedProps.id.toString(), isDetailed)
})
}
function decodeHtmlEntities(value, passes = 1) {
const parser = new DOMParser()
let decoded = value
for (let i = 0; i < passes; i++) {
decoded = parser.parseFromString(decoded, 'text/html').documentElement.textContent
}
return decoded
}