Merge branch 'soon' into staging

4 years ago · 5ade53ebba
parent a1daa86af0 18dc5d9d23
commit 5ade53ebba
1 changed files with 1 additions and 1 deletions
--- a/www/common/proxy-manager.js
+++ b/www/common/proxy-manager.js
@ -237,7 +237,7 @@ define([
        if (!Env.folders[id]) { return {}; }
        var obj = Env.folders[id].proxy.metadata || {};
        for (var k in Env.user.proxy[UserObject.SHARED_FOLDERS][id] || {}) {
-            var data = Util.clone(Env.user.proxy[UserObject.SHARED_FOLDERS][id][k] || {});
+            var data = Util.clone(Env.user.proxy[UserObject.SHARED_FOLDERS][id][k]);
            if (k === "href" && data.indexOf('#') === -1) {
                try {
                    data = Env.user.userObject.cryptor.decrypt(data);