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

Fix WebDAV file sync conflict

Browse source
This commit is contained in:
Dan Stillman 2013-03-26 02:49:21 -04:00
parent 48544729e7
commit 5a005cd5ae
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
chrome/content/zotero/xpcom/storage/webdav.js
View file

@ -220,15 +220,17 @@ Zotero.Sync.Storage.WebDAV = (function () {
var smtime = Zotero.Sync.Storage.getSyncedModificationTime(item.id);
if (smtime != mtime) {
var localData = { modTime: fmtime };
var remoteData = { modTime: mtime };
Zotero.Sync.Storage.QueueManager.addConflict(
request.name, localData, remoteData
);
Zotero.debug("Conflict -- last synced file mod time "
+ "does not match time on storage server"
+ " (" + smtime + " != " + mtime + ")");
return false;
return {
localChanges: false,
remoteChanges: false,
conflict: {
local: { modTime: fmtime },
remote: { modTime: mtime }
}
};
}
}
else {