diff --git a/wp-admin/includes/class-wp-debug-data.php b/wp-admin/includes/class-wp-debug-data.php index b8307cade2..2d6fb418d6 100644 --- a/wp-admin/includes/class-wp-debug-data.php +++ b/wp-admin/includes/class-wp-debug-data.php @@ -489,11 +489,11 @@ class WP_Debug_Data { 'value' => $loading, 'debug' => 'loading...', ), - 'fonts_path' => array( + 'fonts_path' => array( 'label' => __( 'Fonts directory location' ), 'value' => wp_get_font_dir()['basedir'], ), - 'fonts_size' => array( + 'fonts_size' => array( 'label' => __( 'Fonts directory size' ), 'value' => $loading, 'debug' => 'loading...', diff --git a/wp-admin/includes/class-wp-site-health.php b/wp-admin/includes/class-wp-site-health.php index b4231e3f64..ff59759fa3 100644 --- a/wp-admin/includes/class-wp-site-health.php +++ b/wp-admin/includes/class-wp-site-health.php @@ -1844,14 +1844,14 @@ class WP_Site_Health { __( 'Available disk space is critically low, less than %s available. Proceed with caution, updates may fail.' ), size_format( 20 * MB_IN_BYTES ) ); - $result['status'] = 'critical'; + $result['status'] = 'critical'; } elseif ( $available_space < 100 * MB_IN_BYTES ) { $result['description'] = sprintf( /* translators: %s: Available disk space in MB or GB. */ __( 'Available disk space is low, less than %s available.' ), size_format( 100 * MB_IN_BYTES ) ); - $result['status'] = 'recommended'; + $result['status'] = 'recommended'; } return $result; @@ -2771,7 +2771,7 @@ class WP_Site_Health { 'label' => __( 'Available disk space' ), 'test' => 'available_updates_disk_space', ), - 'autoloaded_options' => array( + 'autoloaded_options' => array( 'label' => __( 'Autoloaded options' ), 'test' => 'autoloaded_options', ), diff --git a/wp-admin/themes.php b/wp-admin/themes.php index d74708200f..59d3689e69 100644 --- a/wp-admin/themes.php +++ b/wp-admin/themes.php @@ -231,11 +231,11 @@ wp_localize_script( 'adminUrl' => parse_url( admin_url(), PHP_URL_PATH ), ), 'l10n' => array( - 'addNew' => __( 'Add New Theme' ), - 'search' => __( 'Search installed themes' ), + 'addNew' => __( 'Add New Theme' ), + 'search' => __( 'Search installed themes' ), /* translators: %d: Number of themes. */ - 'themesFound' => __( 'Number of Themes found: %d' ), - 'noThemesFound' => __( 'No themes found. Try a different search.' ), + 'themesFound' => __( 'Number of Themes found: %d' ), + 'noThemesFound' => __( 'No themes found. Try a different search.' ), ), ) ); diff --git a/wp-includes/block-supports/typography.php b/wp-includes/block-supports/typography.php index 066efba6b1..334c01962d 100644 --- a/wp-includes/block-supports/typography.php +++ b/wp-includes/block-supports/typography.php @@ -558,8 +558,8 @@ function wp_get_typography_font_size_value( $preset, $settings = array() ) { } // Fallback to global settings as default. - $global_settings = wp_get_global_settings(); - $settings = wp_parse_args( + $global_settings = wp_get_global_settings(); + $settings = wp_parse_args( $settings, $global_settings ); diff --git a/wp-includes/blocks.php b/wp-includes/blocks.php index 02b02b1188..decc4896c3 100644 --- a/wp-includes/blocks.php +++ b/wp-includes/blocks.php @@ -1152,7 +1152,7 @@ function insert_hooked_blocks_into_rest_response( $response, $post ) { return $response; } - $attributes = array(); + $attributes = array(); $ignored_hooked_blocks = get_post_meta( $post->ID, '_wp_ignored_hooked_blocks', true ); if ( ! empty( $ignored_hooked_blocks ) ) { $ignored_hooked_blocks = json_decode( $ignored_hooked_blocks, true ); @@ -1584,13 +1584,13 @@ function resolve_pattern_blocks( $blocks ) { $i += count( $blocks_to_insert ); } else { if ( ! empty( $blocks[ $i ]['innerBlocks'] ) ) { - $prev_inner_content = $inner_content; - $inner_content = $blocks[ $i ]['innerContent']; - $blocks[ $i ]['innerBlocks'] = resolve_pattern_blocks( + $prev_inner_content = $inner_content; + $inner_content = $blocks[ $i ]['innerContent']; + $blocks[ $i ]['innerBlocks'] = resolve_pattern_blocks( $blocks[ $i ]['innerBlocks'] ); $blocks[ $i ]['innerContent'] = $inner_content; - $inner_content = $prev_inner_content; + $inner_content = $prev_inner_content; } ++$i; } diff --git a/wp-includes/rest-api/endpoints/class-wp-rest-block-patterns-controller.php b/wp-includes/rest-api/endpoints/class-wp-rest-block-patterns-controller.php index c98b2a7c57..065b863be4 100644 --- a/wp-includes/rest-api/endpoints/class-wp-rest-block-patterns-controller.php +++ b/wp-includes/rest-api/endpoints/class-wp-rest-block-patterns-controller.php @@ -164,8 +164,8 @@ class WP_REST_Block_Patterns_Controller extends WP_REST_Controller { public function prepare_item_for_response( $item, $request ) { // Resolve pattern blocks so they don't need to be resolved client-side // in the editor, improving performance. - $blocks = parse_blocks( $item['content'] ); - $blocks = resolve_pattern_blocks( $blocks ); + $blocks = parse_blocks( $item['content'] ); + $blocks = resolve_pattern_blocks( $blocks ); $item['content'] = serialize_blocks( $blocks ); $fields = $this->get_fields_for_response( $request ); diff --git a/wp-includes/rest-api/endpoints/class-wp-rest-themes-controller.php b/wp-includes/rest-api/endpoints/class-wp-rest-themes-controller.php index 0f4da6773a..fe58480fb5 100644 --- a/wp-includes/rest-api/endpoints/class-wp-rest-themes-controller.php +++ b/wp-includes/rest-api/endpoints/class-wp-rest-themes-controller.php @@ -475,7 +475,7 @@ class WP_REST_Themes_Controller extends WP_REST_Controller { 'type' => 'string', 'readonly' => true, ), - 'template_uri' => array( + 'template_uri' => array( 'description' => __( 'The uri for the theme\'s template directory. If this is a child theme, this refers to the parent theme, otherwise this is the same as the theme\'s stylesheet directory.' ), 'type' => 'string', 'format' => 'uri', diff --git a/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php b/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php index d5150d5cc4..c8d9b11a11 100644 --- a/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php +++ b/wp-includes/rest-api/endpoints/class-wp-rest-users-controller.php @@ -78,7 +78,7 @@ class WP_REST_Users_Controller extends WP_REST_Controller { $this->namespace, '/' . $this->rest_base . '/(?P[\d]+)', array( - 'args' => array( + 'args' => array( 'id' => array( 'description' => __( 'Unique identifier for the user.' ), 'type' => 'integer', diff --git a/wp-includes/script-loader.php b/wp-includes/script-loader.php index b62496324b..715477ad8e 100644 --- a/wp-includes/script-loader.php +++ b/wp-includes/script-loader.php @@ -90,7 +90,7 @@ function wp_default_packages_vendor( $scripts ) { $vendor_scripts = array( 'react', - 'react-dom' => array( 'react' ), + 'react-dom' => array( 'react' ), 'react-jsx-runtime' => array( 'react' ), 'regenerator-runtime', 'moment', diff --git a/wp-includes/version.php b/wp-includes/version.php index 143b0bcf8a..ca41911283 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -16,7 +16,7 @@ * * @global string $wp_version */ -$wp_version = '6.6-beta2-58407'; +$wp_version = '6.6-beta2-58408'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.