diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2016-07-20 14:31:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-20 14:31:41 +0200 |
| commit | b37e1ed17f54916e3321427d92afa3f74ebea1b3 (patch) | |
| tree | 913af57fe45245632aef5e71cde26b585168ba3d /apps | |
| parent | f414c664f281ad14ed2b0e976ea73238d895457d (diff) | |
| parent | 45c99c226bd221bdf21a8579834524204b034706 (diff) | |
| download | nextcloud-server-b37e1ed17f54916e3321427d92afa3f74ebea1b3.tar.gz nextcloud-server-b37e1ed17f54916e3321427d92afa3f74ebea1b3.zip | |
Merge pull request #460 from nextcloud/issue-459-html-decoded-error-message-when-uploading-folder
Fix the HTML encoding when uploading a folder in FF when using french…
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/files/js/file-upload.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/files/js/file-upload.js b/apps/files/js/file-upload.js index d5470d0be55..e07093dd17b 100644 --- a/apps/files/js/file-upload.js +++ b/apps/files/js/file-upload.js @@ -474,9 +474,9 @@ OC.Upload = { } else { // HTTP connection problem var message = t('files', 'Error uploading file "{fileName}": {message}', { - fileName: data.files[0].name, + fileName: escapeHTML(data.files[0].name), message: data.errorThrown - }); + }, undefined, {escape: false}); OC.Notification.show(message, {timeout: 0, type: 'error'}); if (data.result) { var result = JSON.parse(data.result); |