mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix "childItems.concat is not a function" sync error

Browse source
This commit is contained in:
Dan Stillman 2009-05-27 09:51:38 +00:00
parent 47be01a6ae
commit 8712f49426
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
chrome/content/zotero/xpcom/sync.js
View file

@ -2489,7 +2489,12 @@ Zotero.Sync.Server.Data = new function() {
// Add items in other object to target one // Add items in other object to target one
if (otherDiff.childItems.length) { if (otherDiff.childItems.length) {
var childItems = targetObj.getChildItems(true); var childItems = targetObj.getChildItems(true);
targetObj.childItems = childItems.concat(otherDiff.childItems); if (childItems) {
targetObj.childItems = childItems.concat(otherDiff.childItems);
}
else {
targetObj.childItems = otherDiff.childItems;
}
var msg = _generateCollectionItemMergeMessage( var msg = _generateCollectionItemMergeMessage(
targetObj.name, targetObj.name,