From 231bc38c43d615a83ae21168e3329a4664e116a3 Mon Sep 17 00:00:00 2001 From: Dan Stillman Date: Sat, 17 Nov 2012 06:29:40 -0500 Subject: [PATCH] Fix invalid local Date Modified updates in some sync situations (This isn't new in 3.0.9.) --- chrome/content/zotero/xpcom/data/item.js | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/chrome/content/zotero/xpcom/data/item.js b/chrome/content/zotero/xpcom/data/item.js index 21ec403780..2d10b4ad3c 100644 --- a/chrome/content/zotero/xpcom/data/item.js +++ b/chrome/content/zotero/xpcom/data/item.js @@ -804,7 +804,7 @@ Zotero.Item.prototype.setField = function(field, value, loadIn) { } // If existing value, make sure it's actually changing - if (this._itemData[fieldID] === value) { + if ((this._itemData[fieldID] + "") === (value + "")) { return false; } @@ -2813,6 +2813,7 @@ Zotero.Item.prototype.relinkAttachmentFile = function(file, skipItemUpdate) { this._skipModTimeUpdate = true; } this.save(); + this._skipModTimeUpdate = false; return false; } @@ -2886,7 +2887,7 @@ Zotero.Item.prototype.__defineSetter__('attachmentLinkMode', function (val) { + "' in Zotero.Item.attachmentLinkMode setter"); } - if (val === this._attachmentLinkMode) { + if (val === this.attachmentLinkMode) { return; } @@ -2938,7 +2939,7 @@ Zotero.Item.prototype.__defineSetter__('attachmentMIMEType', function (val) { val = ''; } - if (val == this._attachmentMIMEType) { + if (val == this.attachmentMIMEType) { return; } @@ -2993,7 +2994,7 @@ Zotero.Item.prototype.__defineSetter__('attachmentCharset', function (val) { val = null; } - if (val == this._attachmentCharset) { + if (val == this.attachmentCharset) { return; } @@ -3041,7 +3042,7 @@ Zotero.Item.prototype.__defineSetter__('attachmentPath', function (val) { val = ''; } - if (val == this._attachmentPath) { + if (val == this.attachmentPath) { return; } @@ -3099,7 +3100,7 @@ Zotero.Item.prototype.__defineSetter__('attachmentSyncState', function (val) { + "' in Zotero.Item.attachmentSyncState setter"); } - if (val == this._attachmentSyncState) { + if (val == this.attachmentSyncState) { return; }