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

Fix conflict when a user was reverting the latest patch from someone else

Browse Source
This commit is contained in:
yflory 2018-11-09 16:38:16 +01:00
parent 8f849d8d4a
commit b166c70a5f
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
www/common/sframe-app-framework.js
View File

@ -259,6 +259,9 @@ define([
if (content === UNINITIALIZED) { return; } if (content === UNINITIALIZED) { return; }
throw new Error("Content must be an object or array, type is " + typeof(content)); throw new Error("Content must be an object or array, type is " + typeof(content));
} }
oldContent = content;
if (Array.isArray(content)) { if (Array.isArray(content)) {
// Pad // Pad
content.push({ metadata: cpNfInner.metadataMgr.getMetadataLazy() }); content.push({ metadata: cpNfInner.metadataMgr.getMetadataLazy() });