Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging

2019-09-03 17:05:23 +02:00
parent e2178f5aa7 31c6e7241e
commit a6a40c3f6a
21 changed files with 256 additions and 473 deletions
--- a/www/common/outer/async-store.js
+++ b/www/common/outer/async-store.js
@@ -253,7 +253,7 @@ define([
                return void cb({error: 'User drive removal blocked!'});
            }

-            store.rpc.removeOwnedChannel(data, function (err) {
+            store.rpc.removeOwnedChannel(channel, function (err) {
                cb({error:err});
            });
        };
--- a/www/common/outer/onlyoffice.js
+++ b/www/common/outer/onlyoffice.js
@@ -91,9 +91,9 @@ define([

            var hk = network.historyKeeper;
            var cfg = {
-                validateKey: obj.validateKey,
+                lastKnownHash: chan.lastKnownHash || chan.lastCpHash,
                metadata: {
-                    lastKnownHash: chan.lastKnownHash || chan.lastCpHash,
+                    validateKey: obj.validateKey,
                    owners: obj.owners,
                    expire: obj.expire
                }