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

Fix a tag syncing edge case (which shouldn't be possible with production sync server)

Browse source
This commit is contained in:
Dan Stillman 2010-12-26 09:14:55 +00:00
parent 3f28260507
commit e2ff2c3ab7
1 changed files with 8 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
chrome/content/zotero/xpcom/sync.js
View file

@ -4212,8 +4212,15 @@ Zotero.Sync.Server.Data = new function() {
function _deleteConflictingTag(syncSession, name, type, libraryID) {
var tagID = Zotero.Tags.getID(name, type, libraryID);
if (tagID) {
Zotero.debug("Deleting conflicting local tag " + tagID);
Zotero.debug("Deleting conflicting local '" + name + "' tag " + tagID);
var tag = Zotero.Tags.get(tagID);
// Tag has already been deleted, which can happen if the server has
// two new tags that differ only in case, and one matches a local tag
// with a different key, causing that tag to be deleted already.
if (!tag) {
Zotero.debug("Local tag " + tagID + " doesn't exist");
return false;
}
var linkedItems = tag.getLinkedItems(true);
Zotero.Tags.erase(tagID);
Zotero.Tags.purge();