From 8712f49426ed96a7f9876b7b2632f19e552bb720 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Wed, 27 May 2009 09:51:38 +0000 Subject: [PATCH] Fix "childItems.concat is not a function" sync error --- chrome/content/zotero/xpcom/sync.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/chrome/content/zotero/xpcom/sync.js b/chrome/content/zotero/xpcom/sync.js index bfcc3ba76..97d998024 100644 --- a/chrome/content/zotero/xpcom/sync.js +++ b/chrome/content/zotero/xpcom/sync.js @@ -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,