From b48d4ec5e966cd79370764bb45fa339f862da43d Mon Sep 17 00:00:00 2001 From: Aileen Nowak Date: Thu, 28 Oct 2021 12:10:17 +0200 Subject: [PATCH] Fixed transitions redirect to BMA loop --- ghost/admin/app/utils/route.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ghost/admin/app/utils/route.js b/ghost/admin/app/utils/route.js index 5d769a7389..71b4176b8b 100644 --- a/ghost/admin/app/utils/route.js +++ b/ghost/admin/app/utils/route.js @@ -12,7 +12,12 @@ Route.reopen({ transition.abort(); this.upgradeStatus.requireUpgrade(); return false; - } else if (this.config.get('hostSettings.forceUpgrade') && transition.to?.name !== 'signout') { + } else if (this.config.get('hostSettings.forceUpgrade')) { + // Do not prevent transitions to the BMA or to signout + if (transition.to?.name === 'pro.index' || transition.to?.name === 'signout') { + return true; + } + transition.abort(); // Catch and redirect every route in a force upgrade state this.billing.openBillingWindow(this.router.currentURL, '/pro');