Fix: Logic error on site editor useSetting. (#32793)

WordPress · Jun 18, 2021 · 7d3a8bf · 7d3a8bf
1 parent 01f5e38
commit 7d3a8bf
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/packages/edit-site/src/components/editor/utils.js b/packages/edit-site/src/components/editor/utils.js
@@ -104,7 +104,7 @@ export function useSetting( path, blockName = '' ) {
 	const topLevelPath = `__experimentalFeatures.${ path }`;
 	const blockPath = `__experimentalFeatures.blocks.${ blockName }.${ path }`;
 	const result = get( settings, blockPath ) ?? get( settings, topLevelPath );
-	if ( PATHS_WITH_MERGE[ path ] ) {
+	if ( result && PATHS_WITH_MERGE[ path ] ) {
 		return result.user ?? result.theme ?? result.core;
 	}
 	return result;