www

commit 1b0ec5d3be84ede2db5d9ecc5c8bd057ee17a9b6
parent 123e2d552d8a10b074c6eaf3bd3e02e6974fb5e0
Author: Dan Stillman <dstillman@zotero.org>
Date:   Sun, 26 Jul 2009 05:45:22 +0000

Collection item membership conflict resulted in removal of local items from collection


Diffstat:
M
chrome/content/zotero/xpcom/sync.js
 | 
5
+++--

1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/chrome/content/zotero/xpcom/sync.js b/chrome/content/zotero/xpcom/sync.js
@@ -2585,7 +2585,7 @@ Zotero.Sync.Server.Data = new function() {
 	}
 	
 	
-	function _mergeCollection(localObj, remoteObj, childItems) {
+	function _mergeCollection(localObj, remoteObj, childItemStore) {
 		var diff = localObj.diff(remoteObj, false, true);
 		if (!diff) {
 			return false;
@@ -2645,7 +2645,7 @@ Zotero.Sync.Server.Data = new function() {
 			alert(msg);
 		}
 		
-		_removeChildItemsFromCollection(targetObj, childItems);
+		_removeChildItemsFromCollection(targetObj, childItemStore);
 		
 		targetObj.save();
 		return true;
@@ -3479,6 +3479,7 @@ Zotero.Sync.Server.Data = new function() {
 		conditionID++;
 		while (search.getSearchCondition(conditionID)) {
 			search.removeCondition(conditionID);
+			conditionID++;
 		}
 		
 		return search;