Merge branch 'soon' into staging

www/common/onlyoffice/inner.js

@@ -2554,6 +2554,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('');
                 });

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 = $('<div>', {