Changeset 53858

Timestamp:

08/08/2022 08:20:43 AM (4 years ago)

Author:

audrasjb

Message:

Editor: Safeguard has_blocks() against fatal errors.

This changeset ensures has_blocks() doesn't return a fatal error when $post is not a valid post. If the post can't be retrieved, the function now returns false.

Props Howdy_McGee, costdev, colonelphantom, audrasjb, dlh, peterwilsoncc.
Fixes #55705.

Location:

trunk

Files:

• src/wp-includes/blocks.php (modified) (1 diff)
• tests/phpunit/tests/blocks/register.php (modified) (1 diff)

trunk/src/wp-includes/blocks.php

@@ -426 +426 @@
         if ( ! is_string( $post ) ) {
                 $wp_post = get_post( $post );
-                if ( $wp_post instanceof WP_Post ) {
-                        $post = $wp_post->post_content;
-                }
+
+                if ( ! $wp_post instanceof WP_Post ) {
+                        return false;
+                }
+
+                $post = $wp_post->post_content;
         }
 

trunk/tests/phpunit/tests/blocks/register.php

@@ -554 +554 @@
 
         /**
+         * Tests that `has_blocks()` returns `false` with an invalid post.
+         *
+         * @ticket 55705
+         *
+         * @covers ::has_blocks
+         */
+        public function test_has_blocks_with_invalid_post() {
+                $a_post = (object) array(
+                        'ID'     => 55705,
+                        'filter' => 'display',
+                );
+                $this->assertFalse( has_blocks( $a_post ) );
+        }
+
+        /**
          * @ticket 49615
          */