diff --git a/chrome/content/zotero/xpcom/data/item.js b/chrome/content/zotero/xpcom/data/item.js index bd13b32b3..b3fe540c4 100644 --- a/chrome/content/zotero/xpcom/data/item.js +++ b/chrome/content/zotero/xpcom/data/item.js @@ -345,8 +345,7 @@ Zotero.Item.prototype.loadFromRow = function(row, reload) { this._init(); } - // If necessary or reloading, set the type, initialize this._itemData, - // and reset _itemDataLoaded + // If necessary or reloading, set the type and reinitialize this._itemData if (reload || (!this._itemTypeID && row.itemTypeID)) { this.setType(row.itemTypeID, true); } diff --git a/chrome/content/zotero/xpcom/storage/webdav.js b/chrome/content/zotero/xpcom/storage/webdav.js index 63faf76ec..e62765522 100644 --- a/chrome/content/zotero/xpcom/storage/webdav.js +++ b/chrome/content/zotero/xpcom/storage/webdav.js @@ -1302,9 +1302,9 @@ Zotero.Sync.Storage.Session.WebDAV.prototype.purgeOrphanedStorageFiles = functio return; } + // If recently purged, skip var lastpurge = Zotero.Prefs.get('lastWebDAVOrphanPurge'); var days = 10; - // Already purged within the last week if (lastpurge && new Date(lastpurge * 1000) > (new Date() - (1000 * 60 * 60 * 24 * days))) { return; }