Changeset 56629 for trunk/src/wp-includes/block-editor.php

Timestamp:

09/20/2023 01:24:32 AM (2 years ago)

Author:

isabel_brison

Message:

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.

File:

• trunk/src/wp-includes/block-editor.php (modified) (4 diffs)

trunk/src/wp-includes/block-editor.php

@@ -410 +410 @@
  *
  * @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() {
@@ -422 +423 @@
 
     if ( ! $is_block_theme || ! $post_ID ) {
-        return array();
+        return null;
     }
 
@@ -458 +459 @@
         $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;
 }
 
@@ -636 +637 @@
     $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;
     }