From ce10d34e5ee7e59949cef9fa154f966994f22bd8 Mon Sep 17 00:00:00 2001 From: Naz Date: Mon, 11 Sep 2023 11:24:29 +0800 Subject: [PATCH] Allowed optionally enabling collections through a flag refs https://github.com/TryGhost/Ghost/pull/18028 - The previous conditional meant that if the "host settings" collections enabled flag was set, we couldn't disable collections. The referenced pull request would also disable the collections across all of the hosted environment instances. The updated logic optionally takes into account the "labs" flag, as it should have from the very beginning. --- .../core/server/services/collections/service.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ghost/core/core/server/services/collections/service.js b/ghost/core/core/server/services/collections/service.js index b7b455f564..bcbe488b59 100644 --- a/ghost/core/core/server/services/collections/service.js +++ b/ghost/core/core/server/services/collections/service.js @@ -33,16 +33,16 @@ class CollectionsServiceWrapper { async init() { const config = require('../../../shared/config'); const labs = require('../../../shared/labs'); - // host setting OR labs "collections" flag has to be enabled to run collections service - if (!config.get('hostSettings:collections:enabled') && !(labs.isSet('collections'))) { - return; - } - if (inited) { - return; + // host setting OR labs "collections" flag has to be enabled to run collections service + if (config.get('hostSettings:collections:enabled') || labs.isSet('collections')) { + if (inited) { + return; + } + + inited = true; + this.api.subscribeToEvents(); } - inited = true; - this.api.subscribeToEvents(); } }