From 45c99c226bd221bdf21a8579834524204b034706 Mon Sep 17 00:00:00 2001
From: Joas Schilling <coding@schilljs.com>
Date: Wed, 20 Jul 2016 13:03:27 +0200
Subject: [PATCH] Fix the HTML encoding when uploading a folder in FF when
using french l10n
---
apps/files/js/file-upload.js | 4 ++--
core/js/js.js | 4 ++--
2 files changed, 4 insertions(+), 4 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);
diff --git a/core/js/js.js b/core/js/js.js
index 07ed396bec9..d2bbbae6362 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -1127,7 +1127,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
*/
@@ -1143,7 +1143,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;
--
GitLab