diff --git a/core/frontend/helpers/content.js b/core/frontend/helpers/content.js index aea3348e5d..d71a3fe75c 100644 --- a/core/frontend/helpers/content.js +++ b/core/frontend/helpers/content.js @@ -42,7 +42,7 @@ module.exports = function content(options = {}) { this.html = ''; } - if (!this.access && !!config.get('enableDeveloperExperiments')) { + if (!this.access && (!!config.get('enableDeveloperExperiments') || !!config.get('portal'))) { return restrictedCta.apply(self, args); } diff --git a/core/frontend/helpers/ghost_head.js b/core/frontend/helpers/ghost_head.js index 17d8e5988f..f10b5d0d3b 100644 --- a/core/frontend/helpers/ghost_head.js +++ b/core/frontend/helpers/ghost_head.js @@ -43,7 +43,7 @@ function getMembersHelper() { const stripeConnectAccountId = settingsCache.get('stripe_connect_account_id'); let membersHelper = ``; - if (config.get('enableDeveloperExperiments')) { + if (config.get('enableDeveloperExperiments') || config.get('portal')) { membersHelper = ``; membersHelper += (``); } diff --git a/core/server/api/canary/config.js b/core/server/api/canary/config.js index f58dc05ac4..242a2c70bf 100644 --- a/core/server/api/canary/config.js +++ b/core/server/api/canary/config.js @@ -20,7 +20,8 @@ module.exports = { clientExtensions: config.get('clientExtensions') || {}, enableDeveloperExperiments: config.get('enableDeveloperExperiments') || false, stripeDirect: config.get('stripeDirect'), - mailgunIsConfigured: config.get('bulkEmail') && config.get('bulkEmail').mailgun + mailgunIsConfigured: config.get('bulkEmail') && config.get('bulkEmail').mailgun, + portal: config.get('portal') }; if (billingUrl) { response.billingUrl = billingUrl; diff --git a/core/shared/config/defaults.json b/core/shared/config/defaults.json index 96a8ca26ff..7d94776888 100644 --- a/core/shared/config/defaults.json +++ b/core/shared/config/defaults.json @@ -114,5 +114,6 @@ "preloadHeaders": false, "adminFrameProtection": true, "sendWelcomeEmail": true, - "stripeDirect": false + "stripeDirect": false, + "portal": false } diff --git a/test/api-acceptance/admin/utils.js b/test/api-acceptance/admin/utils.js index b535530a1a..08dfb81288 100644 --- a/test/api-acceptance/admin/utils.js +++ b/test/api-acceptance/admin/utils.js @@ -23,7 +23,7 @@ const expectedProperties = { action: ['id', 'resource_type', 'actor_type', 'event', 'created_at', 'actor'], - config: ['version', 'environment', 'database', 'mail', 'labs', 'clientExtensions', 'enableDeveloperExperiments', 'useGravatar', 'stripeDirect'], + config: ['version', 'environment', 'database', 'mail', 'labs', 'clientExtensions', 'enableDeveloperExperiments', 'useGravatar', 'stripeDirect', 'portal'], post: _(schema.posts) .keys()