Changeset 14361

Timestamp:

01/15/2025 01:17:01 AM (12 months ago)

Author:

dd32

Message:

Plugin Directory: Import: Protect against invalid block.json's causing a PHP8 fatal.

A block.json should only have an array in the parent field, but some plugins incorrectly specify a string, instead of an array of strings.

Our Block Validator doesn't catch this, as we're using the REST API validator, which acceps strings for array types.

See ​https://core.trac.wordpress.org/ticket/54740

File:

• sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/class-import.php (modified) (2 diffs)

sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/cli/class-import.php

@@ -983 +983 @@
                 $blocks,
                 function( $block ) {
-                    return isset( $block->parent ) && count( $block->parent );
+                    return isset( $block->parent ) && is_array( $block->parent ) && count( $block->parent );
                 }
             );
@@ -990 +990 @@
                 $blocks,
                 function( $block ) {
-                    return ! isset( $block->parent ) || ! count( $block->parent );
+                    return ! isset( $block->parent ) || ! is_array( $block->parent ) || ! count( $block->parent );
                 }
             );