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

This commit is contained in:
Dan Stillman 2009-05-27 09:51:38 +00:00
parent 47be01a6ae
commit 8712f49426

View File

@ -2489,7 +2489,12 @@ Zotero.Sync.Server.Data = new function() {
// Add items in other object to target one
if (otherDiff.childItems.length) {
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(
targetObj.name,