From 34c0adde08d5be52550c42a8e7b3c8e844f7f60d Mon Sep 17 00:00:00 2001
From: Dan Mills <thunder@mozilla.com>
Date: Tue, 29 Jul 2008 17:35:10 -0700
Subject: [PATCH] Remote.put doesn't require the data arg anymore

---
 services/sync/modules/engines.js | 4 ++--
 services/sync/modules/service.js | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/services/sync/modules/engines.js b/services/sync/modules/engines.js
index e6f32da2857f..bc114dfa7929 100644
--- a/services/sync/modules/engines.js
+++ b/services/sync/modules/engines.js
@@ -512,7 +512,7 @@ FileEngine.prototype = {
     yield this._keys.initialize(self.cb, this.engineId);
     this._file.data = {};
     yield this._merge.async(this, self.cb);
-    yield this._file.put(self.cb, this._file.data);
+    yield this._file.put(self.cb);
   },
 
   // NOTE: Assumes this._file has latest server data
@@ -541,7 +541,7 @@ FileEngine.prototype = {
         yield this._keys.getKeyAndIV(self.cb, this.engineId);
       yield this._file.get(self.cb);
       yield this._merge.async(this, self.cb);
-      yield this._file.put(self.cb, this._file.data);
+      yield this._file.put(self.cb);
 
     } catch (e if e.status == 404) {
       this._log.info("Initial upload to server");
diff --git a/services/sync/modules/service.js b/services/sync/modules/service.js
index 4ca01ec4a36c..46187023aa27 100644
--- a/services/sync/modules/service.js
+++ b/services/sync/modules/service.js
@@ -349,6 +349,7 @@ WeaveSvc.prototype = {
       this._log.info("Server version too low.  Wiping server data.");
       yield this._serverWipe.async(this, self.cb);
       yield this._uploadVersion.async(this, self.cb);
+      yield ClientData.upload
 
     } else if (ret.responseText > STORAGE_FORMAT_VERSION) {
       // XXX should we do something here?