From b491408a0c2aa723e332eb27af7f6911e3d9615d Mon Sep 17 00:00:00 2001 From: ansuz Date: Fri, 2 Apr 2021 10:05:29 +0530 Subject: [PATCH 1/2] guard against type errors when users' extensions mangle URLs --- www/support/inner.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/www/support/inner.js b/www/support/inner.js index 0c70e7900..aee0e347a 100644 --- a/www/support/inner.js +++ b/www/support/inner.js @@ -203,6 +203,7 @@ define([ }; var showCategories = function (cat) { hideCategories(); + if (!Array.isArray(cat)) { return void console.error("invalid category"); } cat.forEach(function (c) { APP.$rightside.find('.'+c).show(); }); @@ -214,6 +215,7 @@ define([ var metadataMgr = common.getMetadataMgr(); var privateData = metadataMgr.getPrivateData(); var active = privateData.category || 'tickets'; + if (!categories[active]) { active = 'tickets'; } common.setHash(active); Object.keys(categories).forEach(function (key) { var $category = $('
', { From 6bcb2a65e612d85d2c6d282649071b40e32df7a1 Mon Sep 17 00:00:00 2001 From: ansuz Date: Fri, 2 Apr 2021 10:07:07 +0530 Subject: [PATCH 2/2] leave a note to fix a spreadsheet bug --- www/common/onlyoffice/inner.js | 1 + 1 file changed, 1 insertion(+) diff --git a/www/common/onlyoffice/inner.js b/www/common/onlyoffice/inner.js index ef43b06b0..f82b95153 100644 --- a/www/common/onlyoffice/inner.js +++ b/www/common/onlyoffice/inner.js @@ -2466,6 +2466,7 @@ define([ newDoc = !content.hashes || Object.keys(content.hashes).length === 0; } else if (!privateData.isNewFile) { // This is an empty doc but not a new file: error + // XXX clear cache before reloading UI.errorLoadingScreen(Messages.unableToDisplay, false, function () { common.gotoURL(''); });