Changeset 51711

Timestamp:

09/01/2021 12:33:28 AM (4 years ago)

Author:

desrosj

Message:

Widgets: Pass correct context to get_block_categories() calls.

The get_block_categories() function expects either a WP_Post or a WP_Block_Editor_Context instance as the context argument, not a string.

Follow-up to [50996], [50997].

Props Enchiridion, pbearne, audrasjb, SergeyBiryukov.
Merges [51700] to the 5.8 branch.
Fixes #53757.

Location:

branches/5.8

Files:

• . (modified) (1 prop)
• src/wp-admin/widgets-form-blocks.php (modified) (1 diff)
• src/wp-includes/class-wp-customize-widgets.php (modified) (1 diff)

branches/5.8/src/wp-admin/widgets-form-blocks.php

@@ -53 +53 @@
 wp_add_inline_script(
     'wp-blocks',
-    sprintf( 'wp.blocks.setCategories( %s );', wp_json_encode( get_block_categories( 'widgets-editor' ) ) ),
+    sprintf( 'wp.blocks.setCategories( %s );', wp_json_encode( get_block_categories( $block_editor_context ) ) ),
     'after'
 );

branches/5.8/src/wp-includes/class-wp-customize-widgets.php

@@ -863 +863 @@
             wp_add_inline_script(
                 'wp-blocks',
-                sprintf( 'wp.blocks.setCategories( %s );', wp_json_encode( get_block_categories( 'widgets-customizer' ) ) ),
+                sprintf( 'wp.blocks.setCategories( %s );', wp_json_encode( get_block_categories( $block_editor_context ) ) ),
                 'after'
             );