Fix when editorSettings do not have a default templateLock set

WordPress · Jun 13, 2020 · 8697b04 · 8697b04
1 parent 82e49da
commit 8697b04
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/packages/block-library/src/column/edit.js b/packages/block-library/src/column/edit.js
@@ -90,10 +90,14 @@ export default compose(
 
 		const parentColumnsId = getBlockRootClientId( clientId );
 		const parentOfColumnsId = getBlockRootClientId( parentColumnsId );
+		const columnsParentLock = parentOfColumnsId
+			? getTemplateLock( parentOfColumnsId )
+			: getTemplateLock();
 
 		return {
 			hasChildBlocks: getBlockOrder( clientId ).length > 0,
-			columnsParentLock: getTemplateLock( parentOfColumnsId ),
+			columnsParentLock:
+				columnsParentLock !== undefined ? columnsParentLock : false,
 		};
 	} ),
 	withDispatch( ( dispatch, ownProps, registry ) => {