mirror of
https://github.com/WordPress/WordPress.git
synced 2025-01-09 09:57:38 +01:00
Editor: Fix post editor layout when Post Content has no attributes.
Changes output of `wp_get_post_content_block_attributes` to return null if Post Content block doesn’t exist or empty array if it has no attributes. Props flixos90, mukesh27. Fixes #59358. Built from https://develop.svn.wordpress.org/trunk@56629 git-svn-id: http://core.svn.wordpress.org/trunk@56141 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
f388dc8e38
commit
9699ef2e41
wp-includes
@ -409,11 +409,12 @@ function wp_get_first_block( $blocks, $block_name ) {
|
||||
* Retrieves Post Content block attributes from the current post template.
|
||||
*
|
||||
* @since 6.3.0
|
||||
* @since 6.4.0 Return null if there is no post content block.
|
||||
* @access private
|
||||
*
|
||||
* @global int $post_ID
|
||||
*
|
||||
* @return array Post Content block attributes or empty array if they don't exist.
|
||||
* @return array|null Post Content block attributes array or null if Post Content block doesn't exist.
|
||||
*/
|
||||
function wp_get_post_content_block_attributes() {
|
||||
global $post_ID;
|
||||
@ -421,7 +422,7 @@ function wp_get_post_content_block_attributes() {
|
||||
$is_block_theme = wp_is_block_theme();
|
||||
|
||||
if ( ! $is_block_theme || ! $post_ID ) {
|
||||
return array();
|
||||
return null;
|
||||
}
|
||||
|
||||
$template_slug = get_page_template_slug( $post_ID );
|
||||
@ -457,12 +458,12 @@ function wp_get_post_content_block_attributes() {
|
||||
$template_blocks = parse_blocks( $current_template[0]->content );
|
||||
$post_content_block = wp_get_first_block( $template_blocks, 'core/post-content' );
|
||||
|
||||
if ( ! empty( $post_content_block['attrs'] ) ) {
|
||||
if ( isset( $post_content_block['attrs'] ) ) {
|
||||
return $post_content_block['attrs'];
|
||||
}
|
||||
}
|
||||
|
||||
return array();
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
@ -635,7 +636,7 @@ function get_block_editor_settings( array $custom_settings, $block_editor_contex
|
||||
|
||||
$post_content_block_attributes = wp_get_post_content_block_attributes();
|
||||
|
||||
if ( ! empty( $post_content_block_attributes ) ) {
|
||||
if ( isset( $post_content_block_attributes ) ) {
|
||||
$editor_settings['postContentAttributes'] = $post_content_block_attributes;
|
||||
}
|
||||
|
||||
|
@ -16,7 +16,7 @@
|
||||
*
|
||||
* @global string $wp_version
|
||||
*/
|
||||
$wp_version = '6.4-alpha-56628';
|
||||
$wp_version = '6.4-alpha-56629';
|
||||
|
||||
/**
|
||||
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
|
||||
|
Loading…
Reference in New Issue
Block a user