Regression: Prevent parsing empty custom field setting (#15413)

RocketChat · Sep 20, 2019 · 72aaeb3 · 72aaeb3
1 parent 98a013b
commit 72aaeb3
Showing 1 changed file with 3 additions and 0 deletions.
diff --git 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);