Merge branch hotfix/v8.2.2 into release/v8.3.0

ONLYOFFICE · Dec 9, 2024 · 97229af · 97229af
2 parents a7db22c + 2f58a16
commit 97229af
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/DocService/sources/DocsCoServer.js b/DocService/sources/DocsCoServer.js
@@ -1579,8 +1579,6 @@ async function encryptPasswordParams(ctx, data) {
     dataWithPassword = data.message;
   } else if (data.type === 'auth' && data.openCmd) {
     dataWithPassword = data.openCmd;
-  } else if (data.c === 'savefromorigin') {
-    dataWithPassword = data;
   }
   if (dataWithPassword && dataWithPassword.password) {
     if (dataWithPassword.password.length > constants.PASSWORD_MAX_LENGTH) {

diff --git a/DocService/sources/canvasservice.js b/DocService/sources/canvasservice.js
@@ -1487,7 +1487,6 @@ exports.downloadAs = function(req, res) {
           yield* commandSave(ctx, cmd, outputData);
           break;
         case 'savefromorigin':
-          yield docsCoServer.encryptPasswordParams(ctx, cmd);
           yield* commandSaveFromOrigin(ctx, cmd, outputData, row && row.password);
           break;
         case 'sendmm':

diff --git a/schema/mysql/removetbl.sql b/schema/mysql/removetbl.sql
@@ -1,7 +1,7 @@
-USE onlyoffice;
+-- USE onlyoffice;
 --
 -- Drop tables
 --
 DROP TABLE IF EXISTS `doc_callbacks`;
 DROP TABLE IF EXISTS `doc_changes`;
-DROP TABLE IF EXISTS `task_result`;
+DROP TABLE IF EXISTS `task_result`;