Merge branch 'staging' of github.com:xwiki-labs/cryptpad into login

2016-12-22 17:20:30 +01:00
parent 5534da8abf 81259fc25f
commit 63cd5c16ac
2 changed files with 7 additions and 3 deletions
--- a/customize.dist/fsStore.js
+++ b/customize.dist/fsStore.js
@@ -158,7 +158,7 @@ define([
            if (!rt.proxy[Cryptpad.storageKey] || !Cryptpad.isArray(rt.proxy[Cryptpad.storageKey])) {
                var oldStore = Cryptpad.getStore(true);
                oldStore.get(Cryptpad.storageKey, function (err, s) {
-                    rt.proxy.filesData = s;
+                    rt.proxy[Cryptpad.storageKey] = s;
                    onReady(f, rt.proxy, Cryptpad.storageKey);
                });
                return;