www

commit 840790926bddd0ee8a94271ae976d92ae192eb1f
parent 6eb354bf3630e58fa25cdfd82488ed074bd6694b
Author: Dan Stillman <dstillman@zotero.org>
Date:   Wed,  4 Sep 2013 17:53:11 -0400

Fix merging of tags during sync conflict

If an item was added to a tag on one computer and another item was added
to the tag on a different computer, and then they both synced one of the
tags could be removed on the second computer to sync.

Diffstat:
M
chrome/content/zotero/xpcom/data/tag.js
 | 
4
++--

1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/chrome/content/zotero/xpcom/data/tag.js b/chrome/content/zotero/xpcom/data/tag.js
@@ -535,10 +535,10 @@ Zotero.Tag.prototype.diff = function (tag, includeMatches, ignoreOnlyDateModifie
 	
 	// For the moment, just compare linked items and increase numDiffs if any differences
 	var d1 = Zotero.Utilities.arrayDiff(
-		otherData.linkedItems, thisData.linkedItems
+		thisData.linkedItems, otherData.linkedItems
 	);
 	var d2 = Zotero.Utilities.arrayDiff(
-		thisData.linkedItems, otherData.linkedItems
+		otherData.linkedItems, thisData.linkedItems
 	);
 	numDiffs += d1.length + d2.length;