From d65da0a6b6594c4ee31af18e089437b3d2e40455 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Sun, 16 Aug 2009 16:28:20 +0000 Subject: [PATCH] Incorrect local mod time in file conflict CR window fix from 2.0b6.5 --- chrome/content/zotero/xpcom/storage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chrome/content/zotero/xpcom/storage.js b/chrome/content/zotero/xpcom/storage.js index 9cd520844..af66a90eb 100644 --- a/chrome/content/zotero/xpcom/storage.js +++ b/chrome/content/zotero/xpcom/storage.js @@ -1315,7 +1315,7 @@ Zotero.Sync.Storage = new function () { var smtime = Zotero.Sync.Storage.getSyncedModificationTime(item.id); if (smtime != mtime) { - var localData = { modTime: smtime }; + var localData = { modTime: fmtime }; var remoteData = { modTime: mtime }; Zotero.Sync.Storage.QueueManager.addConflict( request.name, localData, remoteData