web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Caleb James DeLisle 2017-08-23 12:15:01 +02:00
commit 5d9599c9b7
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
www/common/toolbar3.js
View File

@ -871,7 +871,7 @@ define([
if (netfluxIds.indexOf(u) === -1) { if (netfluxIds.indexOf(u) === -1) {
var temp = JSON.parse(JSON.stringify(oldUserData[u])); var temp = JSON.parse(JSON.stringify(oldUserData[u]));
delete oldUserData[u]; delete oldUserData[u];
if (temp.uid === newdata[userNetfluxId].uid) { return; } if (temp && newdata[userNetfluxId] && temp.uid === newdata[userNetfluxId].uid) { return; }
if (userPresent(u, temp, newdata || oldUserData) < 1) { if (userPresent(u, temp, newdata || oldUserData) < 1) {
notify(-1, temp.name); notify(-1, temp.name);
} }