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

Incorrect local mod time in file conflict CR window fix from 2.0b6.5

Browse source
This commit is contained in:
Dan Stillman 2009-08-16 16:28:20 +00:00
parent b98eefc932
commit d65da0a6b6
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
chrome/content/zotero/xpcom/storage.js
View file

@ -1315,7 +1315,7 @@ Zotero.Sync.Storage = new function () {
var smtime = Zotero.Sync.Storage.getSyncedModificationTime(item.id); var smtime = Zotero.Sync.Storage.getSyncedModificationTime(item.id);
if (smtime != mtime) { if (smtime != mtime) {
var localData = { modTime: smtime }; var localData = { modTime: fmtime };
var remoteData = { modTime: mtime }; var remoteData = { modTime: mtime };
Zotero.Sync.Storage.QueueManager.addConflict( Zotero.Sync.Storage.QueueManager.addConflict(
request.name, localData, remoteData request.name, localData, remoteData