From a1bf86e8566dfad123926339b16d9a16a4bfd77a Mon Sep 17 00:00:00 2001
From: Erez Rokah <erezrokah@users.noreply.github.com>
Date: Wed, 1 Apr 2020 13:16:30 +0300
Subject: [PATCH] fix: don't override empty public folder (#3513)

---
 .../src/actions/__tests__/config.spec.js               | 10 ++++++++++
 packages/netlify-cms-core/src/actions/config.js        |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/packages/netlify-cms-core/src/actions/__tests__/config.spec.js b/packages/netlify-cms-core/src/actions/__tests__/config.spec.js
index 07e6680c..6d53f9c0 100644
--- a/packages/netlify-cms-core/src/actions/__tests__/config.spec.js
+++ b/packages/netlify-cms-core/src/actions/__tests__/config.spec.js
@@ -57,6 +57,16 @@ describe('config', () => {
             }),
           ).get('public_folder'),
         ).toEqual('/publib/path');
+        expect(
+          applyDefaults(
+            fromJS({
+              foo: 'bar',
+              media_folder: 'path/to/media',
+              public_folder: '',
+              collections: [],
+            }),
+          ).get('public_folder'),
+        ).toEqual('');
       });
     });
 
diff --git a/packages/netlify-cms-core/src/actions/config.js b/packages/netlify-cms-core/src/actions/config.js
index 635fc4e2..4be4daaf 100644
--- a/packages/netlify-cms-core/src/actions/config.js
+++ b/packages/netlify-cms-core/src/actions/config.js
@@ -39,7 +39,7 @@ export function applyDefaults(config) {
 
       // Use media_folder as default public_folder.
       const defaultPublicFolder = `/${trimStart(map.get('media_folder'), '/')}`;
-      if (!map.get('public_folder')) {
+      if (!map.has('public_folder')) {
         map.set('public_folder', defaultPublicFolder);
       }