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

Coding Standards: Various alignment fixes from `composer format`. 

Follow up to [53874], [54097], [54110], [54155], [54162], [54184].

See #39210, #55443, #56288, #56092, #56408, #56467, #55881.
Built from https://develop.svn.wordpress.org/trunk@54210


git-svn-id: http://core.svn.wordpress.org/trunk@53769 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
desrosj 2022-09-19 19:51:09 +00:00
parent 0fe6115af2
commit 1966addc05
8 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-includes/block-editor.php
View File

@ -428,7 +428,7 @@ function get_block_editor_settings( array $custom_settings, $block_editor_contex
$actual_css = wp_get_global_stylesheet( array( $block_classes['css'] ) );
if ( '' !== $actual_css ) {
$block_classes['css'] = $actual_css;
$global_styles[] = $block_classes;
$global_styles[] = $block_classes;
}
}
@ -493,7 +493,7 @@ function get_block_editor_settings( array $custom_settings, $block_editor_contex
}
if ( isset( $editor_settings['__experimentalFeatures']['spacing']['spacingSizes'] ) ) {
$spacing_sizes_by_origin = $editor_settings['__experimentalFeatures']['spacing']['spacingSizes'];
$spacing_sizes_by_origin = $editor_settings['__experimentalFeatures']['spacing']['spacingSizes'];
$editor_settings['spacingSizes'] = isset( $spacing_sizes_by_origin['custom'] ) ?
$spacing_sizes_by_origin['custom'] : (
isset( $spacing_sizes_by_origin['theme'] ) ?

2
wp-includes/block-template-utils.php
View File

@ -552,7 +552,7 @@ function _build_block_template_result_from_post( $post ) {
}
$theme = $terms[0]->name;
$template_file = _get_block_template_file( $post->post_type, $post->post_name );
$template_file = _get_block_template_file( $post->post_type, $post->post_name );
$has_theme_file = wp_get_theme()->get_stylesheet() === $theme && null !== $template_file;
$origin = get_post_meta( $post->ID, 'origin', true );

2
wp-includes/class-wp-block-type.php
View File

@ -347,7 +347,7 @@ class WP_Block_Type {
return;
}
$new_name = $name . '_handles';
$new_name = $name . '_handles';
$this->{$new_name}[0] = $value;
}

2
wp-includes/class-wp-image-editor-gd.php
View File

@ -310,7 +310,7 @@ class WP_Image_Editor_GD extends WP_Image_Editor {
imagedestroy( $resized );
}
$this->size = $orig_size;
$this->size = $orig_size;
$this->size_name = $orig_size_name;
if ( ! is_wp_error( $saved ) ) {

4
wp-includes/cron.php
View File

@ -1127,9 +1127,9 @@ function wp_get_ready_cron_jobs() {
return $pre;
}
$crons = _get_cron_array();
$crons = _get_cron_array();
$gmt_time = microtime( true );
$results = array();
$results = array();
foreach ( $crons as $timestamp => $cronhooks ) {
if ( $timestamp > $gmt_time ) {

2
wp-includes/l10n.php
View File

@ -1270,7 +1270,7 @@ function _load_textdomain_just_in_time( $domain ) {
}
$locale = determine_locale();
$path = $wp_textdomain_registry->get( $domain, $locale );
$path = $wp_textdomain_registry->get( $domain, $locale );
if ( ! $path ) {
return false;
}

8
wp-includes/rest-api/endpoints/class-wp-rest-block-types-controller.php
View File

@ -256,7 +256,7 @@ class WP_REST_Block_Types_Controller extends WP_REST_Controller {
$data['is_dynamic'] = $block_type->is_dynamic();
}
$schema = $this->get_item_schema();
$schema = $this->get_item_schema();
// Fields deprecated in WordPress 6.1, but left in the schema for backwards compatibility.
$deprecated_fields = array(
'editor_script',
@ -688,13 +688,13 @@ class WP_REST_Block_Types_Controller extends WP_REST_Controller {
'context' => array( 'embed', 'view', 'edit' ),
'readonly' => true,
),
'keywords' => $keywords_definition,
'example' => $example_definition,
'keywords' => $keywords_definition,
'example' => $example_definition,
),
);
// Properties deprecated in WordPress 6.1, but left in the schema for backwards compatibility.
$deprecated_properties = array(
$deprecated_properties = array(
'editor_script' => array(
'description' => __( 'Editor script handle. DEPRECATED: Use `editor_script_handles` instead.' ),
'type' => array( 'string', 'null' ),

2
wp-includes/version.php
View File

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