From a972e8131ff9d190ccdc1e992080f27590f5b363 Mon Sep 17 00:00:00 2001 From: gziolo Date: Fri, 29 Apr 2022 14:10:09 +0000 Subject: [PATCH] Editor: Fix core 'Featured' pattern category registration Backports changes from https://github.com/WordPress/gutenberg/pull/40650. Patch fixes regression, and moves core "Featured" pattern category registration from `_load_remote_featured_patterns` into `_register_core_block_patterns_and_categories`. Follow-up [53152]. Props mamaduka, ntsekouras. See #55567. Built from https://develop.svn.wordpress.org/trunk@53312 git-svn-id: http://core.svn.wordpress.org/trunk@52901 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/block-patterns.php | 5 +---- wp-includes/version.php | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/wp-includes/block-patterns.php b/wp-includes/block-patterns.php index 8b922e7dd1..58ec8443b1 100644 --- a/wp-includes/block-patterns.php +++ b/wp-includes/block-patterns.php @@ -38,6 +38,7 @@ function _register_core_block_patterns_and_categories() { register_block_pattern_category( 'buttons', array( 'label' => _x( 'Buttons', 'Block pattern category' ) ) ); register_block_pattern_category( 'columns', array( 'label' => _x( 'Columns', 'Block pattern category' ) ) ); + register_block_pattern_category( 'featured', array( 'label' => _x( 'Featured', 'Block pattern category' ) ) ); register_block_pattern_category( 'gallery', array( 'label' => _x( 'Gallery', 'Block pattern category' ) ) ); register_block_pattern_category( 'header', array( 'label' => _x( 'Headers', 'Block pattern category' ) ) ); register_block_pattern_category( 'text', array( 'label' => _x( 'Text', 'Block pattern category' ) ) ); @@ -104,10 +105,6 @@ function _load_remote_featured_patterns() { return; } - if ( ! WP_Block_Pattern_Categories_Registry::get_instance()->is_registered( 'featured' ) ) { - register_block_pattern_category( 'featured', array( 'label' => __( 'Featured' ) ) ); - } - $request = new WP_REST_Request( 'GET', '/wp/v2/pattern-directory/patterns' ); $featured_cat_id = 26; // This is the `Featured` category id from pattern directory. $request->set_param( 'category', $featured_cat_id ); diff --git a/wp-includes/version.php b/wp-includes/version.php index 3eeee2d19a..20868b0c6c 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.0-beta3-53311'; +$wp_version = '6.0-beta3-53312'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.