From cbd163d921fd4accab802c39d1e32aafd2e3cc7d Mon Sep 17 00:00:00 2001 From: Sam Lord Date: Fri, 9 Jul 2021 10:23:26 +0100 Subject: [PATCH 1/5] Updated Ghost-Admin to v4.9.2 --- core/client | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/client b/core/client index 2eeab23fa4..b0b9802328 160000 --- a/core/client +++ b/core/client @@ -1 +1 @@ -Subproject commit 2eeab23fa4578ddc68e327eeaae04f8948d730e9 +Subproject commit b0b98023288fe1eb543b6b295896012451c1661c From fa231a1995b0c56eca7f3d54fefe3201ae78aa35 Mon Sep 17 00:00:00 2001 From: Sam Lord Date: Fri, 9 Jul 2021 10:23:26 +0100 Subject: [PATCH 2/5] v4.9.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index defa9270ac..edfea9904c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ghost", - "version": "4.9.1", + "version": "4.9.2", "description": "The professional publishing platform", "author": "Ghost Foundation", "homepage": "https://ghost.org", From f9a3f7d955dee22e91bc9c755b3c1d58bbc3b193 Mon Sep 17 00:00:00 2001 From: Kevin Ansfield Date: Fri, 9 Jul 2021 19:27:49 +0100 Subject: [PATCH 3/5] =?UTF-8?q?=F0=9F=90=9B=20Fixed=20"Cannot=20destructur?= =?UTF-8?q?e=20property"=20error=20when=20overwriting=20active=20theme?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit refs https://github.com/TryGhost/action-deploy-theme/issues/45 - added missing `throw error` in the `setFromZip()` catch which was hiding the underlying error when a theme uploaded and saved successfully but other code had failed - fixed incorrect method name `activator.activateFromOverride` -> `activator.activateFromAPIOverride` --- core/server/services/themes/storage.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/server/services/themes/storage.js b/core/server/services/themes/storage.js index 880117a276..6be9d1eb1c 100644 --- a/core/server/services/themes/storage.js +++ b/core/server/services/themes/storage.js @@ -81,7 +81,7 @@ module.exports = { // CASE: if this is the active theme, we are overriding if (overrideTheme) { debug('setFromZip Theme is active alreadu'); - activator.activateFromOverride(themeName, loadedTheme, checkedTheme); + activator.activateFromAPIOverride(themeName, loadedTheme, checkedTheme); } // @TODO: unify the name across gscan and Ghost! @@ -98,6 +98,8 @@ module.exports = { throw error; }); } + + throw error; }); } From fcf3667c042a0236eb14431a1d954e4b4f89c6aa Mon Sep 17 00:00:00 2001 From: Sam Lord Date: Fri, 9 Jul 2021 20:41:27 +0100 Subject: [PATCH 4/5] Updated Ghost-Admin to v4.9.3 --- core/client | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/client b/core/client index b0b9802328..2047f29240 160000 --- a/core/client +++ b/core/client @@ -1 +1 @@ -Subproject commit b0b98023288fe1eb543b6b295896012451c1661c +Subproject commit 2047f292402352ddc88c6eb886f1dbf05b27530c From 88670dfa28f80a43b0d89d1f9cb8256f1570c754 Mon Sep 17 00:00:00 2001 From: Sam Lord Date: Fri, 9 Jul 2021 20:41:27 +0100 Subject: [PATCH 5/5] v4.9.3 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index edfea9904c..5e6efc53aa 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ghost", - "version": "4.9.2", + "version": "4.9.3", "description": "The professional publishing platform", "author": "Ghost Foundation", "homepage": "https://ghost.org",