Changeset 56629

Timestamp:

09/20/2023 01:24:32 AM (15 months 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.

Location:

trunk

Files:

• src/wp-includes/block-editor.php (modified) (4 diffs)
• tests/phpunit/data/themedir1/block-theme-post-content-default (added)
• tests/phpunit/data/themedir1/block-theme-post-content-default/style.css (added)
• tests/phpunit/data/themedir1/block-theme-post-content-default/templates (added)
• tests/phpunit/data/themedir1/block-theme-post-content-default/templates/index.html (added)
• tests/phpunit/data/themedir1/block-theme-post-content-default/templates/single.html (added)
• tests/phpunit/data/themedir1/block-theme-post-content-default/theme.json (added)
• tests/phpunit/tests/blocks/editor.php (modified) (2 diffs)
• tests/phpunit/tests/theme/themeDir.php (modified) (1 diff)

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;
     }

trunk/tests/phpunit/tests/blocks/editor.php

@@ -447 +447 @@
             ),
         );
-        // With no block theme, expect an empty array.
+        // With no block theme, expect null.
+        $this->assertNull( wp_get_post_content_block_attributes() );
+
+        switch_theme( 'block-theme' );
+
+        $this->assertSame( $attributes_with_layout, wp_get_post_content_block_attributes() );
+    }
+
+    public function test_wp_get_post_content_block_attributes_no_layout() {
+        switch_theme( 'block-theme-post-content-default' );
+
         $this->assertSame( array(), wp_get_post_content_block_attributes() );
-
-        switch_theme( 'block-theme' );
-
-        $this->assertSame( $attributes_with_layout, wp_get_post_content_block_attributes() );
     }
 
@@ -529 +535 @@
 
     /**
+     * @ticket 59358
+     */
+    public function test_get_block_editor_settings_without_post_content_block() {
+
+        $post_editor_context = new WP_Block_Editor_Context( array( 'post' => get_post() ) );
+
+        $settings = get_block_editor_settings( array(), $post_editor_context );
+
+        $this->assertArrayNotHasKey( 'postContentAttributes', $settings );
+
+    }
+
+    /**
      * @ticket 52920
      * @expectedDeprecated block_editor_settings

trunk/tests/phpunit/tests/theme/themeDir.php

@@ -186 +186 @@
             'Block Theme [1.0.0] in subdirectory',
             'Block Theme Deprecated Path',
+            'Block Theme Post Content Default',
             'Block Theme with defined Typography Fonts',
             'Empty `fontFace` in theme.json - no webfonts defined',