Browse Source

Merge pull request #29029 from nextcloud/fix/28243/render-html-entities

Fix HTML entity rendering in file comments sidebar
pull/29590/head
Carl Schwan 4 years ago
committed by GitHub
parent
commit
d879299a61
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 64
      apps/comments/js/comments-app.js
  2. 2
      apps/comments/js/comments-app.js.map
  3. 19
      apps/comments/src/services/GetComments.js

64
apps/comments/js/comments-app.js
File diff suppressed because it is too large
View File

2
apps/comments/js/comments-app.js.map
File diff suppressed because it is too large
View File

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

@ -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
}
Loading…
Cancel
Save