www

commit 2bcd77f870e5e1831264fb8513683360cd69248b
parent da9ac72d517f3c1ce88d5f371b282a9d70d085d9
Author: Dan Stillman <dstillman@zotero.org>
Date:   Fri, 12 Aug 2016 01:51:14 -0400

Temporary fix for 404 uploading missing object with local version

This shouldn't happen, but if it does, the API should return a 412 for
such objects, resulting in a full sync. Until the API fix is rolled out,
do the same on a 404.

Diffstat:
M
chrome/content/zotero/xpcom/sync/syncEngine.js
 | 
4
+++-

1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/chrome/content/zotero/xpcom/sync/syncEngine.js b/chrome/content/zotero/xpcom/sync/syncEngine.js
@@ -1013,7 +1013,9 @@ Zotero.Sync.Data.Engine.prototype._uploadObjects = Zotero.Promise.coroutine(func
 			// This shouldn't happen, because the upload request includes a library
 			// version and should prevent an outdated upload before the object version is
 			// checked. If it does, we need to do a full sync.
-			if (e.code == 412) {
+			// TEMP - Revert after 2016-08-19
+			//if (e.code == 412) {
+			if (e.code == 404 || e.code == 412) {
 				return this.UPLOAD_RESULT_OBJECT_CONFLICT;
 			}