From 4c46ebcf96db54382f9279f58cdadd58bf4aadb1 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Sat, 21 May 2016 15:52:10 -0400
Subject: [PATCH] loadAllData() no longer necessary before fromJSON()

Post-deasyncification
---
 chrome/content/zotero/xpcom/sync/syncEngine.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/chrome/content/zotero/xpcom/sync/syncEngine.js b/chrome/content/zotero/xpcom/sync/syncEngine.js
index c5bd0dfaf..e34b70bc2 100644
--- a/chrome/content/zotero/xpcom/sync/syncEngine.js
+++ b/chrome/content/zotero/xpcom/sync/syncEngine.js
@@ -935,7 +935,6 @@ Zotero.Sync.Data.Engine.prototype._uploadObjects = Zotero.Promise.coroutine(func
 				
 				if (state == 'successful') {
 					// Update local object with saved data if necessary
-					yield obj.loadAllData();
 					obj.fromJSON(current.data);
 					toSave.push(obj);
 					toCache.push(current);