mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Fix merging of tags during sync conflict

Browse source 
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.
This commit is contained in:
Dan Stillman 2013-09-04 17:53:11 -04:00
parent 6eb354bf36
commit 840790926b
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
chrome/content/zotero/xpcom/data/tag.js
View file

@ -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;