www

commit 8712f49426ed96a7f9876b7b2632f19e552bb720
parent 47be01a6ae1f53a3a3a5308a544557f4d3e6af47
Author: Dan Stillman <dstillman@zotero.org>
Date:   Wed, 27 May 2009 09:51:38 +0000

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


Diffstat:
M
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
@@ -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,