www

commit d65da0a6b6594c4ee31af18e089437b3d2e40455
parent b98eefc9325609e80e8902ebcbba854585f8d75b
Author: Dan Stillman <dstillman@zotero.org>
Date:   Sun, 16 Aug 2009 16:28:20 +0000

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


Diffstat:
M
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
@@ -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