Merge branch 'soon' into staging

www/common/outer/async-store.js

@@ -788,6 +788,7 @@ define([
                 getAllStores().forEach(function (s) {
                     s.manager.getPadAttribute(data, waitFor(function (err, val) {
                         if (err) { return; }
+                        if (!val || typeof(val) !== "object") { return void console.error("Not an object!"); }
                         if (!res.value || res.atime < val.atime) {
                             res.atime = val.atime;
                             res.value = val.value;

www/common/proxy-manager.js

@@ -741,8 +741,12 @@ define([
         cb = cb || function () {};
         var sfId = Env.user.userObject.getSFIdFromHref(data.href);
         if (sfId) {
+            var sfData = Env.user.proxy[UserObject.SHARED_FOLDERS][sfId];
             setTimeout(function () {
-                cb(null, Env.user.proxy[UserObject.SHARED_FOLDERS][sfId][data.attr]);
+                cb(null, {
+                    value: sfData[data.attr],
+                    atime: 1
+                });
             });
             return;
         }

www/share/main.js

@@ -94,6 +94,7 @@ define([
                             password: config.data.password,
                             isTemplate: config.data.isTemplate,
                             file: config.data.file,
+                            enableTeams: localStorage.CryptPad_teams === "1",
                         };
                         for (var k in additionalPriv) { metaObj.priv[k] = additionalPriv[k]; }