From a48cb89e53d9f32255f108ca9a619ecca29005f0 Mon Sep 17 00:00:00 2001 From: Rish Date: Tue, 8 Dec 2020 13:27:17 +0530 Subject: [PATCH 1/2] =?UTF-8?q?=F0=9F=90=9B=20Fixed=20email=20design=20set?= =?UTF-8?q?tings=20not=20opening?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit closes https://github.com/TryGhost/Ghost/issues/12459 - Email design settings don't open in some cases when footer html is set as null, specifically on import - Patches html cleanup to use empty string in case of null footer value --- .../koenig-editor/addon/components/koenig-basic-html-input.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ghost/admin/lib/koenig-editor/addon/components/koenig-basic-html-input.js b/ghost/admin/lib/koenig-editor/addon/components/koenig-basic-html-input.js index e1eccd6323..2179729fa2 100644 --- a/ghost/admin/lib/koenig-editor/addon/components/koenig-basic-html-input.js +++ b/ghost/admin/lib/koenig-editor/addon/components/koenig-basic-html-input.js @@ -48,7 +48,7 @@ export default Component.extend({ /* computed properties -------------------------------------------------- */ cleanHTML: computed('html', function () { - return cleanBasicHtml(this.html); + return cleanBasicHtml(this.html || ''); }), // merge in named options with any passed in `options` property data-bag @@ -392,7 +392,7 @@ export default Component.extend({ return ''; } - let html = firstParagraph.innerHTML; + let html = firstParagraph.innerHTML || ''; return cleanBasicHtml(html); } } From 16614d2aaebc9b98ac7db5f8a0b5493ef863c7e1 Mon Sep 17 00:00:00 2001 From: Daniel Lockyer Date: Tue, 8 Dec 2020 09:37:00 +0000 Subject: [PATCH 2/2] v3.39.3 --- ghost/admin/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ghost/admin/package.json b/ghost/admin/package.json index abb6dad6b3..b82b843490 100644 --- a/ghost/admin/package.json +++ b/ghost/admin/package.json @@ -1,6 +1,6 @@ { "name": "ghost-admin", - "version": "3.39.2", + "version": "3.39.3", "description": "Ember.js admin client for Ghost", "author": "Ghost Foundation", "homepage": "http://ghost.org",