From 72aaeb3201f42c8e47c1c54085828b516e8343c9 Mon Sep 17 00:00:00 2001
From: Marcos Spessatto Defendi <marcos.defendi@ulbra.inf.br>
Date: Fri, 20 Sep 2019 00:35:55 -0300
Subject: [PATCH] Regression: Prevent parsing empty custom field setting
 (#15413)

---
 app/api/server/api.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/api/server/api.js b/app/api/server/api.js
index 67f40369b685..d0b4f0de4a04 100644
--- a/app/api/server/api.js
+++ b/app/api/server/api.js
@@ -611,6 +611,9 @@ settings.get('API_Enable_CORS', (key, value) => {
 });
 
 settings.get('Accounts_CustomFields', (key, value) => {
+	if (!value) {
+		return API.v1.setLimitedCustomFields([]);
+	}
 	try {
 		const customFields = JSON.parse(value);
 		const nonPublicCustomFields = Object.keys(customFields).filter((customFieldKey) => customFields[customFieldKey].public !== true);