blitzwing/cryptpad
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix merge conflict

Browse source
This commit is contained in:
ansuz 2020-02-04 11:18:53 -05:00
commit 6ae6445d95
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
www/common/outer/messenger.js
View file

@ -893,9 +893,7 @@ define([
}; };
var clearOwnedChannel = function (ctx, id, cb) { var clearOwnedChannel = function (ctx, id, cb) {
// XXX clients is undefined if you try to clear history from contacts var channel = ctx.channels[id];
// while not using workers
var channel = ctx.clients[id];
if (!channel) { return void cb({error: 'NO_CHANNEL'}); } if (!channel) { return void cb({error: 'NO_CHANNEL'}); }
if (!ctx.store.rpc) { return void cb({error: 'RPC_NOT_READY'}); } if (!ctx.store.rpc) { return void cb({error: 'RPC_NOT_READY'}); }
ctx.store.rpc.clearOwnedChannel(id, function (err) { ctx.store.rpc.clearOwnedChannel(id, function (err) {