Skip to content

Fix the HTML encoding when uploading a folder in FF when using french… #491

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rullzer merged 1 commit into from
Jul 22, 2016
Merged

Fix the HTML encoding when uploading a folder in FF when using french… #491

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions apps/files/js/file-upload.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
4 changes: 2 additions & 2 deletions core/js/js.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1131,7 +1131,7 @@ OC.Notification={
*
* @param {string} text Message to display
* @param {Object} [options] options
* @param {string] [options.type] notification type
* @param {string} [options.type] notification type
* @param {int} [options.timeout=0] timeout value, defaults to 0 (permanent)
* @return {jQuery} jQuery element for notification row
*/
Expand All @@ -1147,7 +1147,7 @@ OC.Notification={
* @param {array} [options] options array
* @param {int} [options.timeout=7] timeout in seconds, if this is 0 it will show the message permanently
* @param {boolean} [options.isHTML=false] an indicator for HTML notifications (true) or text (false)
* @param {string] [options.type] notification type
* @param {string} [options.type] notification type
*/
showTemporary: function(text, options) {
var self = this;
Expand Down