WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Editor: Fix version in WP_Theme_JSON_Resolver::get_block_data(). 

Introduced during the WP 6.1 alpha cycle, this commit fixes the version number from `1` to `2`.

Follow-up to [54162].

Props oandregal.
See #56467.
Built from https://develop.svn.wordpress.org/trunk@54491


git-svn-id: http://core.svn.wordpress.org/trunk@54050 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
hellofromTonya 2022-10-11 16:40:14 +00:00
parent 2d9b8cd286
commit 87a38efddc
6 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/blocks/navigation-link.php
View File

@ -100,7 +100,7 @@ function block_core_navigation_link_build_css_font_sizes( $context ) {
// Add the custom font size inline style.
$font_sizes['inline_styles'] = sprintf(
'font-size: %s;',
gutenberg_get_typography_font_size_value(
wp_get_typography_font_size_value(
array(
'size' => $context['style']['typography']['fontSize'],
)

2
wp-includes/blocks/navigation-submenu.php
View File

@ -100,7 +100,7 @@ function block_core_navigation_submenu_build_css_font_sizes( $context ) {
// Add the custom font size inline style.
$font_sizes['inline_styles'] = sprintf(
'font-size: %s;',
gutenberg_get_typography_font_size_value(
wp_get_typography_font_size_value(
array(
'size' => $context['style']['typography']['fontSize'],
)

2
wp-includes/blocks/page-list.php
View File

@ -121,7 +121,7 @@ function block_core_page_list_build_css_font_sizes( $context ) {
// Add the custom font size inline style.
$font_sizes['inline_styles'] = sprintf(
'font-size: %s;',
gutenberg_get_typography_font_size_value(
wp_get_typography_font_size_value(
array(
'size' => $context['style']['typography']['fontSize'],
)

2
wp-includes/blocks/search.php
View File

@ -444,7 +444,7 @@ function get_typography_styles_for_block_core_search( $attributes ) {
if ( ! empty( $attributes['style']['typography']['fontSize'] ) ) {
$typography_styles[] = sprintf(
'font-size: %s;',
gutenberg_get_typography_font_size_value(
wp_get_typography_font_size_value(
array(
'size' => $attributes['style']['typography']['fontSize'],
)

2
wp-includes/class-wp-theme-json-resolver.php
View File

@ -272,7 +272,7 @@ class WP_Theme_JSON_Resolver {
public static function get_block_data() {
$registry = WP_Block_Type_Registry::get_instance();
$blocks = $registry->get_all_registered();
$config = array( 'version' => 1 );
$config = array( 'version' => 2 );
foreach ( $blocks as $block_name => $block_type ) {
if ( isset( $block_type->supports['__experimentalStyle'] ) ) {
$config['styles']['blocks'][ $block_name ] = static::remove_json_comments( $block_type->supports['__experimentalStyle'] );

2
wp-includes/version.php
View File

@ -16,7 +16,7 @@
*
* @global string $wp_version
*/
$wp_version = '6.1-beta3-54490';
$wp_version = '6.1-beta3-54491';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.