From e692a85e1d7aefc80c35f42cab26cd7c0eea00fc Mon Sep 17 00:00:00 2001 From: yflory Date: Thu, 25 Feb 2021 15:09:40 +0100 Subject: [PATCH 1/2] Fix missing translation key --- www/common/drive-ui.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js index 7715b39b8..43946a502 100644 --- a/www/common/drive-ui.js +++ b/www/common/drive-ui.js @@ -2495,7 +2495,7 @@ define([ h('h4', Messages.sharedFolders_create), h('label', {for: 'cp-app-drive-sf-name'}, Messages.sharedFolders_create_name), h('input#cp-app-drive-sf-name', {type: 'text', placeholder: Messages.fm_newFolder}), - h('label', {for: 'cp-app-drive-sf-password'}, Messages.sharedFolders_create_password), + h('label', {for: 'cp-app-drive-sf-password'}, Messages.fm_shareFolderPassword), UI.passwordInput({id: 'cp-app-drive-sf-password'}), h('span', { style: 'display:flex;align-items:center;justify-content:space-between' From 18dc5d9d233fb93df532e527f20cde4fd381611d Mon Sep 17 00:00:00 2001 From: yflory Date: Thu, 25 Feb 2021 16:11:37 +0100 Subject: [PATCH 2/2] Fix share folder with empty password --- www/common/proxy-manager.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/common/proxy-manager.js b/www/common/proxy-manager.js index eb7895161..a7a4abe6f 100644 --- a/www/common/proxy-manager.js +++ b/www/common/proxy-manager.js @@ -237,7 +237,7 @@ define([ if (!Env.folders[id]) { return {}; } var obj = Env.folders[id].proxy.metadata || {}; for (var k in Env.user.proxy[UserObject.SHARED_FOLDERS][id] || {}) { - var data = Util.clone(Env.user.proxy[UserObject.SHARED_FOLDERS][id][k] || {}); + var data = Util.clone(Env.user.proxy[UserObject.SHARED_FOLDERS][id][k]); if (k === "href" && data.indexOf('#') === -1) { try { data = Env.user.userObject.cryptor.decrypt(data);