Merge branch 'staging' into ro

2019-10-28 15:10:29 +01:00
parent a1e4c52a83 9090002e1f
commit 289f71ae8b
11 changed files with 49 additions and 33 deletions
--- a/www/common/outer/async-store.js
+++ b/www/common/outer/async-store.js
@@ -552,7 +552,7 @@ define([
        // Get the metadata for sframe-common-outer
        Store.getMetadata = function (clientId, app, cb) {
            var disableThumbnails = Util.find(store.proxy, ['settings', 'general', 'disableThumbnails']);
-            var teams = store.modules['team']  && store.modules['team'].getTeamsData(app);
+            var teams = (store.modules['team'] && store.modules['team'].getTeamsData(app)) || {};
            var metadata = {
                // "user" is shared with everybody via the userlist
                user: {