mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #25244 from nextcloud/backport/25234/stable20 

[stable20] Fix encoding issue with OC.Notification.show
This commit is contained in:
Roeland Jago Douma 2021-01-23 10:47:29 +01:00 committed by GitHub
parent 6cc8c337dc b7d8b3a72d
commit 5663d3e463
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/js/dist/login.js vendored
View File

File diff suppressed because one or more lines are too long

2
core/js/dist/login.js.map vendored
View File

File diff suppressed because one or more lines are too long

2
core/js/dist/main.js vendored
View File

File diff suppressed because one or more lines are too long

2
core/js/dist/main.js.map vendored
View File

File diff suppressed because one or more lines are too long

11
core/src/OC/notification.js
View File

@ -115,9 +115,18 @@ export default {
* @deprecated 17.0.0 use the `@nextcloud/dialogs` package * @deprecated 17.0.0 use the `@nextcloud/dialogs` package
*/ */
show(text, options) { show(text, options) {
const escapeHTML = function(text) {
return text.toString()
.split('&').join('&')
.split('<').join('&lt;')
.split('>').join('&gt;')
.split('"').join('&quot;')
.split('\'').join('&#039;')
}
options = options || {} options = options || {}
options.timeout = (!options.timeout) ? -1 : options.timeout options.timeout = (!options.timeout) ? -1 : options.timeout
const toast = showMessage(text, options) const toast = showMessage(escapeHTML(text), options)
toast.toastElement.toastify = toast toast.toastElement.toastify = toast
return $(toast.toastElement) return $(toast.toastElement)
}, },