infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

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

pull/1/head
yflory 2021-09-28 15:44:34 +02:00
parent 04e298dd46 7ae5654b83
commit fab629bf6d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -617,11 +617,11 @@ define([
return void cb({error: 'NO_SUCH_CHANNEL'});
}
var proxy = ctx.store.proxy;
var proxy = ctx.store.proxy || {};
var msg = [Types.message, proxy.curvePublic, +new Date(), payload];
if (!channel.isFriendChat) {
var name = proxy[Constants.displayNameKey] ||
Messages.anonymous + '#' + proxy.uid.slice(0,5);
Messages.anonymous + '#' + (proxy.uid || ctx.store.noDriveUid).slice(0,5);
msg.push(name);
}
var msgStr = JSON.stringify(msg);