From 928d74ecc4930ce9077afae85f03a9b93f55759b Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Wed, 5 May 2021 16:00:32 +0200
Subject: [PATCH 1/2] Fix team calendar with cache disabled

---
 www/common/outer/team.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/www/common/outer/team.js b/www/common/outer/team.js
index c5423ff7b..0ec224984 100644
--- a/www/common/outer/team.js
+++ b/www/common/outer/team.js
@@ -348,7 +348,7 @@ define([
                 });
             }, true);
         }).nThen(function () {
-            if (ctx.store.calendar) { ctx.store.calendar.openTeam(id); }
+            if (ctx.store.modules.calendar) { ctx.store.modules.calendar.openTeam(id); }
             cb();
         });
     };
@@ -407,6 +407,7 @@ define([
                 });
             }
             delete ctx.onReadyHandlers[id];
+            if (ctx.store.modules.calendar) { ctx.store.modules.calendar.openTeam(id); }
             cb();
         });
 

From b0352e8252be05c1d3c94a4651084820fcff01a9 Mon Sep 17 00:00:00 2001
From: yflory <yann.flory@xwiki.com>
Date: Thu, 6 May 2021 16:31:56 +0200
Subject: [PATCH 2/2] Fix unsafe link with anonymous shared folder

---
 www/common/drive-ui.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index 87c40ffd4..aea222188 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -1125,7 +1125,7 @@ define([
 
             var priv = metadataMgr.getPrivateData();
             var useUnsafe = Util.find(priv, ['settings', 'security', 'unsafeLinks']);
-            if (useUnsafe === true) {
+            if (useUnsafe === true || APP.newSharedFolder) {
                 return void window.open(APP.origin + href);
             }